diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml
index d52b0ec1..e3047ab7 100644
--- a/.github/workflows/push_tests.yml
+++ b/.github/workflows/push_tests.yml
@@ -27,11 +27,11 @@ jobs:
       - name: Lint with flake8
         run: |
           pip install flake8
-          make lint
+          make lint-server
       - name: Lint all with eslint
         if: github.ref == 'refs/heads/master'
         run: |
-           make lint-client
+          make lint-client
       - name: Lint diff with eslint
         if: github.ref != 'refs/heads/master'
         run: |
diff --git a/Makefile b/Makefile
index 3c8cdf52..8f5e731e 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,10 @@ fmt-py:
 	black .
 
 .PHONY: lint
-lint:
+lint: lint-server lint-client
+
+.PHONY: lint-server
+lint-server:
 	flake8 server
 
 .PHONY: lint-client