diff --git a/Makefile b/Makefile
index f3440d04..3640cf78 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ test-e2e:
 	$(NPM) test
 
 test-python:
-	$(FLASK) test_local
+	$(PYTEST) mpwo_api
 
 upgrade-db:
 	$(FLASK) db upgrade --directory $(MIGRATIONS)
diff --git a/mpwo_api/server.py b/mpwo_api/server.py
index 9d8c5f8e..3afcb393 100644
--- a/mpwo_api/server.py
+++ b/mpwo_api/server.py
@@ -42,16 +42,10 @@ def run_test(test_path='mpwo_api/tests'):
 
 
 @app.cli.command()
-def test(test_path='mpwo_api/tests'):
+def test():
     """Runs the tests without code coverage."""
     run_test()
 
 
-@app.cli.command()
-def test_local():
-    """Runs the tests without code coverage in local machine w/ make."""
-    run_test('mpwo_api/mpwo_api/tests')
-
-
 if __name__ == '__main__':
     app.run()
diff --git a/test.sh b/test.sh
index d2620b89..74fffa59 100644
--- a/test.sh
+++ b/test.sh
@@ -8,7 +8,7 @@ inspect() {
   fi
 }
 
-docker-compose -f docker-compose-ci.yml run mpwo-api flask test
+docker-compose -f docker-compose-ci.yml run mpwo-api py.test mpwo_api
 inspect $? api
 
 testcafe chrome mpwo_client/e2e