diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml
index b4cfe599..70fcf947 100644
--- a/.github/workflows/push_tests.yml
+++ b/.github/workflows/push_tests.yml
@@ -31,9 +31,10 @@ jobs:
       - name: Install dependencies
         run: |
           pip install flake8
+          pip install black
           cd client
           npm install
-      - name: Lint with flake8
+      - name: Format with black and lint with flake8
         run: |
           make lint-server
       - name: Lint src with eslint
diff --git a/Makefile b/Makefile
index 56dccf59..ca8754f7 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ fmt-py:
 lint: lint-server lint-client
 
 .PHONY: lint-server
-lint-server:
+lint-server: fmt-py
 	flake8 server --per-file-ignores='server/test/fixtures/dataset_config_outline.py:F821 server/test/fixtures/server_config_outline.py:F821'