diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18ad13f..d64f737 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,4 +228,4 @@ workflows:
             - unittest_37
             - integrationtest_36
             - integrationtest_37
-            - style_check
\ No newline at end of file
+            - style_check
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..52f0e87
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+.PHONY: all lint
+
+all_tests: lint unittest integration
+
+help:
+	@echo "Please use 'make <target>' where <target> is one of:"
+	@echo "  lint			to run flake8 on all Python files"
+	@echo "  unittest		to run unit tests on phys2denoise"
+	@echo "  integration	to run the integration test set on phys2denoise"
+	@echo "  all_tests		to run 'lint', 'unittest', and 'integration'"
+
+lint:
+	@flake8 phys2denoise
+
+unittest:
+	@py.test --skipintegration --cov-append --cov-report term-missing --cov=phys2denoise phys2denoise/
+
+integration:
+	@pip install -e ".[test]"
+	@py.test --log-cli-level=INFO --cov-append --cov-report term-missing --cov=phys2denoise -k test_integration phys2denoise/tests/test_integration.py