diff --git a/Makefile b/Makefile
index aff9f9c..79d6617 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ stylecheck:
 
 coverage:
 	rm -rf cover/
-	nosetests tests/test_Direct*.py --with-coverage --cover-package=email2pdf --cover-erase --cover-html
-	open cover/email2pdf.html
+	nosetests tests/Direct/*.py --with-coverage --cover-package=email2pdf,tests --cover-erase --cover-html --cover-branches
+	open cover/index.html
 
 alltests: unittest stylecheck coverage
diff --git a/tests/Direct/__init__.py b/tests/Direct/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_Direct_Arguments.py b/tests/Direct/test_Direct_Arguments.py
similarity index 100%
rename from tests/test_Direct_Arguments.py
rename to tests/Direct/test_Direct_Arguments.py
diff --git a/tests/test_Direct_AttachmentDetection.py b/tests/Direct/test_Direct_AttachmentDetection.py
similarity index 100%
rename from tests/test_Direct_AttachmentDetection.py
rename to tests/Direct/test_Direct_AttachmentDetection.py
diff --git a/tests/test_Direct_CID.py b/tests/Direct/test_Direct_CID.py
similarity index 100%
rename from tests/test_Direct_CID.py
rename to tests/Direct/test_Direct_CID.py
diff --git a/tests/test_Direct_Errors.py b/tests/Direct/test_Direct_Errors.py
similarity index 100%
rename from tests/test_Direct_Errors.py
rename to tests/Direct/test_Direct_Errors.py
diff --git a/tests/test_Direct_FrozenTime.py b/tests/Direct/test_Direct_FrozenTime.py
similarity index 100%
rename from tests/test_Direct_FrozenTime.py
rename to tests/Direct/test_Direct_FrozenTime.py
diff --git a/tests/test_Direct_Metadata.py b/tests/Direct/test_Direct_Metadata.py
similarity index 100%
rename from tests/test_Direct_Metadata.py
rename to tests/Direct/test_Direct_Metadata.py
diff --git a/tests/Subprocess/__init__.py b/tests/Subprocess/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_Subprocess_Basic.py b/tests/Subprocess/test_Subprocess_Basic.py
similarity index 100%
rename from tests/test_Subprocess_Basic.py
rename to tests/Subprocess/test_Subprocess_Basic.py
diff --git a/tests/test_Subprocess_MIME.py b/tests/Subprocess/test_Subprocess_MIME.py
similarity index 100%
rename from tests/test_Subprocess_MIME.py
rename to tests/Subprocess/test_Subprocess_MIME.py