diff --git a/test/common.py b/test/bethesda/common.py
similarity index 99%
rename from test/common.py
rename to test/bethesda/common.py
index ba83d03..f241b1f 100755
--- a/test/common.py
+++ b/test/bethesda/common.py
@@ -41,7 +41,7 @@ class AmmoController:
     def __init__(self):
         self.game = GAME
         script_path = Path(__file__)
-        self.downloads_dir = script_path.parent / "Downloads"
+        self.downloads_dir = script_path.parent.parent / "Downloads"
 
     def __enter__(self):
         """
diff --git a/test/test_compatibility.py b/test/bethesda/test_compatibility.py
similarity index 99%
rename from test/test_compatibility.py
rename to test/bethesda/test_compatibility.py
index b80350e..1a85dff 100755
--- a/test/test_compatibility.py
+++ b/test/bethesda/test_compatibility.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 from pathlib import Path
+import pytest
 from common import (
     mod_extracts_files,
     mod_installs_files,
diff --git a/test/test_compatibility_fomod.py b/test/bethesda/test_compatibility_fomod.py
similarity index 100%
rename from test/test_compatibility_fomod.py
rename to test/bethesda/test_compatibility_fomod.py
diff --git a/test/test_conflict_resolution.py b/test/bethesda/test_conflict_resolution.py
similarity index 100%
rename from test/test_conflict_resolution.py
rename to test/bethesda/test_conflict_resolution.py
diff --git a/test/test_controller_instance.py b/test/bethesda/test_controller_instance.py
similarity index 100%
rename from test/test_controller_instance.py
rename to test/bethesda/test_controller_instance.py
diff --git a/test/test_find.py b/test/bethesda/test_find.py
similarity index 100%
rename from test/test_find.py
rename to test/bethesda/test_find.py
diff --git a/test/test_fomod_controller_instance.py b/test/bethesda/test_fomod_controller_instance.py
similarity index 100%
rename from test/test_fomod_controller_instance.py
rename to test/bethesda/test_fomod_controller_instance.py
diff --git a/test/test_pending_changes.py b/test/bethesda/test_pending_changes.py
similarity index 100%
rename from test/test_pending_changes.py
rename to test/bethesda/test_pending_changes.py
diff --git a/test/test_rename.py b/test/bethesda/test_rename.py
similarity index 100%
rename from test/test_rename.py
rename to test/bethesda/test_rename.py
diff --git a/test/test_validation.py b/test/bethesda/test_validation.py
similarity index 100%
rename from test/test_validation.py
rename to test/bethesda/test_validation.py
diff --git a/test/conftest.py b/test/conftest.py
new file mode 100755
index 0000000..e5a0d9b
--- /dev/null
+++ b/test/conftest.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3