diff --git a/Makefile b/Makefile
index 7acf6f1..77d0d0c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,9 @@ test:
 	${MAKE} unit
 	${MAKE} clean
 
+# Run all tests in tests/unit/
 unit:
-	${CASK} exec buttercup -L .
+	${CASK} exec buttercup -L . tests/unit/
 
 build:
 	${CASK} build
diff --git a/tests/test-webpaste-get-provider-priority.el b/tests/unit/test-webpaste-get-provider-priority.el
similarity index 100%
rename from tests/test-webpaste-get-provider-priority.el
rename to tests/unit/test-webpaste-get-provider-priority.el
diff --git a/tests/test-webpaste-paste-region-and-buffer.el b/tests/unit/test-webpaste-paste-region-and-buffer.el
similarity index 100%
rename from tests/test-webpaste-paste-region-and-buffer.el
rename to tests/unit/test-webpaste-paste-region-and-buffer.el
diff --git a/tests/test-webpaste-paste-text.el b/tests/unit/test-webpaste-paste-text.el
similarity index 100%
rename from tests/test-webpaste-paste-text.el
rename to tests/unit/test-webpaste-paste-text.el
diff --git a/tests/test-webpaste-provider-creation.el b/tests/unit/test-webpaste-provider-creation.el
similarity index 100%
rename from tests/test-webpaste-provider-creation.el
rename to tests/unit/test-webpaste-provider-creation.el
diff --git a/tests/test-webpaste-return-url.el b/tests/unit/test-webpaste-return-url.el
similarity index 100%
rename from tests/test-webpaste-return-url.el
rename to tests/unit/test-webpaste-return-url.el
diff --git a/tests/test-webpaste.el b/tests/unit/test-webpaste.el
similarity index 100%
rename from tests/test-webpaste.el
rename to tests/unit/test-webpaste.el