diff --git a/tests/default.nix b/tests/default.nix
index 318e549b1..95a0f16bc 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -17,13 +17,6 @@ import nmt {
   testedAttrPath = [ "home" "activationPackage" ];
   tests = {
     browserpass = ./modules/programs/browserpass.nix;
-    files-executable = ./modules/files/executable.nix;
-    files-hidden-source = ./modules/files/hidden-source.nix;
-    files-source-with-spaces = ./modules/files/source-with-spaces.nix;
-    files-text = ./modules/files/text.nix;
-    git-with-email = ./modules/programs/git-with-email.nix;
-    git-with-most-options = ./modules/programs/git.nix;
-    git-with-str-extra-config = ./modules/programs/git-with-str-extra-config.nix;
     mbsync = ./modules/programs/mbsync.nix;
     texlive-minimal = ./modules/programs/texlive-minimal.nix;
     xresources = ./modules/xresources.nix;
@@ -41,10 +34,12 @@ import nmt {
     // import ./modules/services/sxhkd
     // import ./modules/systemd
   )
+  // import ./modules/files
   // import ./modules/home-environment
   // import ./modules/misc/fontconfig
   // import ./modules/programs/alacritty
   // import ./modules/programs/bash
+  // import ./modules/programs/git
   // import ./modules/programs/gpg
   // import ./modules/programs/newsboat
   // import ./modules/programs/readline
diff --git a/tests/modules/files/default.nix b/tests/modules/files/default.nix
new file mode 100644
index 000000000..04c61d3b8
--- /dev/null
+++ b/tests/modules/files/default.nix
@@ -0,0 +1,6 @@
+{
+  files-executable = ./executable.nix;
+  files-hidden-source = ./hidden-source.nix;
+  files-source-with-spaces = ./source-with-spaces.nix;
+  files-text = ./text.nix;
+}
diff --git a/tests/modules/programs/git/default.nix b/tests/modules/programs/git/default.nix
new file mode 100644
index 000000000..45aface8d
--- /dev/null
+++ b/tests/modules/programs/git/default.nix
@@ -0,0 +1,5 @@
+{
+  git-with-email = ./git-with-email.nix;
+  git-with-most-options = ./git.nix;
+  git-with-str-extra-config = ./git-with-str-extra-config.nix;
+}
diff --git a/tests/modules/programs/git-expected.conf b/tests/modules/programs/git/git-expected.conf
similarity index 100%
rename from tests/modules/programs/git-expected.conf
rename to tests/modules/programs/git/git-expected.conf
diff --git a/tests/modules/programs/git-with-email-expected.conf b/tests/modules/programs/git/git-with-email-expected.conf
similarity index 100%
rename from tests/modules/programs/git-with-email-expected.conf
rename to tests/modules/programs/git/git-with-email-expected.conf
diff --git a/tests/modules/programs/git-with-email.nix b/tests/modules/programs/git/git-with-email.nix
similarity index 93%
rename from tests/modules/programs/git-with-email.nix
rename to tests/modules/programs/git/git-with-email.nix
index a7107aa82..350921981 100644
--- a/tests/modules/programs/git-with-email.nix
+++ b/tests/modules/programs/git/git-with-email.nix
@@ -3,7 +3,7 @@
 with lib;
 
 {
-  imports = [ ../accounts/email-test-accounts.nix ];
+  imports = [ ../../accounts/email-test-accounts.nix ];
 
   config = {
     programs.git = {
diff --git a/tests/modules/programs/git-with-str-extra-config-expected.conf b/tests/modules/programs/git/git-with-str-extra-config-expected.conf
similarity index 100%
rename from tests/modules/programs/git-with-str-extra-config-expected.conf
rename to tests/modules/programs/git/git-with-str-extra-config-expected.conf
diff --git a/tests/modules/programs/git-with-str-extra-config.nix b/tests/modules/programs/git/git-with-str-extra-config.nix
similarity index 100%
rename from tests/modules/programs/git-with-str-extra-config.nix
rename to tests/modules/programs/git/git-with-str-extra-config.nix
diff --git a/tests/modules/programs/git.nix b/tests/modules/programs/git/git.nix
similarity index 100%
rename from tests/modules/programs/git.nix
rename to tests/modules/programs/git/git.nix