diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b051a5..fef7280 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,4 +24,4 @@ jobs:
       - name: Test with pytest
         run: |
           pip install pytest pytest-cov
-          pytest tests.py --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html
+          python -m pytest test/ --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html
diff --git a/Makefile b/Makefile
index fdc2b0e..4ce40e4 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ test: deps
 	python -m pytest test
 
 
-build: deps
+build: deps test
 	@echo "Building..."
 	python3 -m build --sdist
 	python3 -m build --wheel
@@ -57,3 +57,5 @@ help:
 	@echo "  clean           Clean build files"
 	@echo "  help            Show this help message"
 	@echo "  publish         Publish package to PyPI"
+
+.DEFAULT_GOAL := build