diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml
index f205e067..bdc27fda 100644
--- a/.github/workflows/push_tests.yml
+++ b/.github/workflows/push_tests.yml
@@ -25,9 +25,18 @@ jobs:
       - name: Lint with flake8
         run: |
           pip install flake8
+          make lint
       - name: Lint diff with eslint
+        branches-ignore:
+          - master
         run: |
-          cd client && make lint-diff
+          cd client && make lint-diff-client
+      - name: Lint with eslint
+        branches:
+          - master
+        run: |
+        make lint-client
+
 
   unit-test:
     runs-on: ubuntu-latest