diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5c6a87b9f..604614eb0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,8 +1,15 @@
 repos:
   - repo: local
     hooks:
+    - id: codechecks
+      name: codechecks
+      stages: ["commit"]
+      entry: "tox -e codechecks"
+      language: system
+      pass_filenames: false
     - id: test
       name: test
+      stages: ["push"]
       entry: "make test"
       language: system
       pass_filenames: false
diff --git a/Makefile b/Makefile
index 16ecf9757..f3f93539f 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,7 @@ default:
 
 .PHONY: build
 ## Set up and build for local development
-# To also run checks on every commit:
-# $ make .git/hooks/pre-commit
-build: .tox .git/hooks/pre-push
+build: .tox .git/hooks/pre-commit .git/hooks/pre-push
 
 .PHONY: test
 ## Run all tests and code reports