diff --git a/Makefile b/Makefile
index bb22db4d..fb61004c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,10 @@ test-install: install
 	. venv/bin/activate; pip install -r test/requirements.txt
 
 test: test-install
+	. venv/bin/activate; coverage run -m unittest discover -s test/unit
 
 test-integ: test
-	. venv/bin/activate; coverage run -m unittest discover
+	. venv/bin/activate; coverage run -m unittest discover -s test/integ
 
 version ?= latest
 test-docker:
diff --git a/test/integ/__init__.py b/test/integ/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test/test_sendgrid.py b/test/integ/test_sendgrid.py
similarity index 100%
rename from test/test_sendgrid.py
rename to test/integ/test_sendgrid.py
diff --git a/test/unit/__init__.py b/test/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test/test_app.py b/test/unit/test_app.py
similarity index 100%
rename from test/test_app.py
rename to test/unit/test_app.py
diff --git a/test/test_config.py b/test/unit/test_config.py
similarity index 100%
rename from test/test_config.py
rename to test/unit/test_config.py
diff --git a/test/test_email.py b/test/unit/test_email.py
similarity index 100%
rename from test/test_email.py
rename to test/unit/test_email.py
diff --git a/test/test_eventwebhook.py b/test/unit/test_eventwebhook.py
similarity index 100%
rename from test/test_eventwebhook.py
rename to test/unit/test_eventwebhook.py
diff --git a/test/test_inbound_send.py b/test/unit/test_inbound_send.py
similarity index 100%
rename from test/test_inbound_send.py
rename to test/unit/test_inbound_send.py
diff --git a/test/test_mail_helpers.py b/test/unit/test_mail_helpers.py
similarity index 100%
rename from test/test_mail_helpers.py
rename to test/unit/test_mail_helpers.py
diff --git a/test/test_parse.py b/test/unit/test_parse.py
similarity index 100%
rename from test/test_parse.py
rename to test/unit/test_parse.py
diff --git a/test/test_project.py b/test/unit/test_project.py
similarity index 100%
rename from test/test_project.py
rename to test/unit/test_project.py
diff --git a/test/test_spam_check.py b/test/unit/test_spam_check.py
similarity index 100%
rename from test/test_spam_check.py
rename to test/unit/test_spam_check.py
diff --git a/test/test_stats.py b/test/unit/test_stats.py
similarity index 100%
rename from test/test_stats.py
rename to test/unit/test_stats.py
diff --git a/test/test_twilio_email.py b/test/unit/test_twilio_email.py
similarity index 100%
rename from test/test_twilio_email.py
rename to test/unit/test_twilio_email.py
diff --git a/test/test_unassigned.py b/test/unit/test_unassigned.py
similarity index 100%
rename from test/test_unassigned.py
rename to test/unit/test_unassigned.py