diff --git a/tests/test_content_generator.py b/tests/test_builder/test_content_generator.py
similarity index 99%
rename from tests/test_content_generator.py
rename to tests/test_builder/test_content_generator.py
index 6ccf6e7b..1144c61f 100644
--- a/tests/test_content_generator.py
+++ b/tests/test_builder/test_content_generator.py
@@ -16,7 +16,7 @@ from mock import patch, Mock, call, mock_open
 import kobo.rpmlib
 
 from tests import init_data
-from tests.test_views.test_views import FakeSCM
+from tests.test_web.test_views import FakeSCM
 
 import koji
 
@@ -61,9 +61,10 @@ class TestBuild:
         # Necessary to restart the twisted reactor for the next test.
         import sys
 
-        del sys.modules["twisted.internet.reactor"]
-        del sys.modules["moksha.hub.reactor"]
-        del sys.modules["moksha.hub"]
+        for mod in ("twisted.internet.reactor", "moksha.hub.reactor", "moksha.hub"):
+            if mod in sys.modules:
+                del sys.modules[mod]
+
         import moksha.hub.reactor  # noqa
 
         try:
diff --git a/tests/test_get_generator_json_expected_output.json b/tests/test_builder/test_get_generator_json_expected_output.json
similarity index 100%
rename from tests/test_get_generator_json_expected_output.json
rename to tests/test_builder/test_get_generator_json_expected_output.json
diff --git a/tests/test_get_generator_json_expected_output_with_log.json b/tests/test_builder/test_get_generator_json_expected_output_with_log.json
similarity index 100%
rename from tests/test_get_generator_json_expected_output_with_log.json
rename to tests/test_builder/test_get_generator_json_expected_output_with_log.json
diff --git a/tests/test_get_generator_json_rpms_in_tag.json b/tests/test_builder/test_get_generator_json_rpms_in_tag.json
similarity index 100%
rename from tests/test_get_generator_json_rpms_in_tag.json
rename to tests/test_builder/test_get_generator_json_rpms_in_tag.json