diff --git a/Makefile b/Makefile
index c2a2cadf..97fb5d29 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,9 @@ make-p:
 build-client: lint-client
 	cd fittrackee_client && $(NPM) build
 
-check-all: lint-all type-check test-python test-client
+check-all: lint-all type-check test-all
+
+check-client: lint-client test-client
 
 check-python: lint-python type-check test-python
 
@@ -167,6 +169,8 @@ set-admin:
 test-e2e:
 	$(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
 
+test-all: test-client test-python
+
 test-e2e-client:
 	E2E_ARGS=client $(PYTEST) e2e --driver firefox $(PYTEST_ARGS)