diff --git a/tests/modules/services/git-sync-darwin/default.nix b/tests/modules/services/git-sync-darwin/default.nix
deleted file mode 100644
index eadd4def..00000000
--- a/tests/modules/services/git-sync-darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  git-sync = ./basic.nix;
-}
diff --git a/tests/modules/services/git-sync-darwin/basic.nix b/tests/modules/services/git-sync/darwin/basic.nix
similarity index 100%
rename from tests/modules/services/git-sync-darwin/basic.nix
rename to tests/modules/services/git-sync/darwin/basic.nix
diff --git a/tests/modules/services/git-sync/darwin/default.nix b/tests/modules/services/git-sync/darwin/default.nix
new file mode 100644
index 00000000..cc4f9b38
--- /dev/null
+++ b/tests/modules/services/git-sync/darwin/default.nix
@@ -0,0 +1,3 @@
+{
+  git-sync = ./basic.nix;
+}
diff --git a/tests/modules/services/git-sync-darwin/expected-agent.plist b/tests/modules/services/git-sync/darwin/expected-agent.plist
similarity index 100%
rename from tests/modules/services/git-sync-darwin/expected-agent.plist
rename to tests/modules/services/git-sync/darwin/expected-agent.plist
diff --git a/tests/modules/services/git-sync/default.nix b/tests/modules/services/git-sync/default.nix
index bb39a12c..4b1206a2 100644
--- a/tests/modules/services/git-sync/default.nix
+++ b/tests/modules/services/git-sync/default.nix
@@ -1,6 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  git-sync = ./basic.nix;
-  git-sync-with-whitespace = ./whitespace.nix;
-}
+(lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin (import ./darwin/default.nix))
+// (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (import ./linux/default.nix))
diff --git a/tests/modules/services/git-sync/basic.nix b/tests/modules/services/git-sync/linux/basic.nix
similarity index 100%
rename from tests/modules/services/git-sync/basic.nix
rename to tests/modules/services/git-sync/linux/basic.nix
diff --git a/tests/modules/services/git-sync/linux/default.nix b/tests/modules/services/git-sync/linux/default.nix
new file mode 100644
index 00000000..7a2000a3
--- /dev/null
+++ b/tests/modules/services/git-sync/linux/default.nix
@@ -0,0 +1,4 @@
+{
+  git-sync = ./basic.nix;
+  git-sync-with-whitespace = ./whitespace.nix;
+}
diff --git a/tests/modules/services/git-sync/whitespace.nix b/tests/modules/services/git-sync/linux/whitespace.nix
similarity index 100%
rename from tests/modules/services/git-sync/whitespace.nix
rename to tests/modules/services/git-sync/linux/whitespace.nix