diff --git a/tests/modules/services/nix-gc-darwin/default.nix b/tests/modules/services/nix-gc-darwin/default.nix
deleted file mode 100644
index c629b1d35..000000000
--- a/tests/modules/services/nix-gc-darwin/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  nix-gc = ./basic.nix;
-  darwin-nix-gc-interval-assertion = ./darwin-nix-gc-interval-assertion.nix;
-}
diff --git a/tests/modules/services/nix-gc-darwin/basic.nix b/tests/modules/services/nix-gc/darwin/basic.nix
similarity index 100%
rename from tests/modules/services/nix-gc-darwin/basic.nix
rename to tests/modules/services/nix-gc/darwin/basic.nix
diff --git a/tests/modules/services/nix-gc-darwin/darwin-nix-gc-interval-assertion.nix b/tests/modules/services/nix-gc/darwin/darwin-nix-gc-interval-assertion.nix
similarity index 100%
rename from tests/modules/services/nix-gc-darwin/darwin-nix-gc-interval-assertion.nix
rename to tests/modules/services/nix-gc/darwin/darwin-nix-gc-interval-assertion.nix
diff --git a/tests/modules/services/nix-gc/darwin/default.nix b/tests/modules/services/nix-gc/darwin/default.nix
new file mode 100644
index 000000000..070820b37
--- /dev/null
+++ b/tests/modules/services/nix-gc/darwin/default.nix
@@ -0,0 +1,4 @@
+{
+  nix-gc = ./basic.nix;
+  nix-gc-interval-assertion = ./darwin-nix-gc-interval-assertion.nix;
+}
diff --git a/tests/modules/services/nix-gc-darwin/expected-agent.plist b/tests/modules/services/nix-gc/darwin/expected-agent.plist
similarity index 100%
rename from tests/modules/services/nix-gc-darwin/expected-agent.plist
rename to tests/modules/services/nix-gc/darwin/expected-agent.plist
diff --git a/tests/modules/services/nix-gc/default.nix b/tests/modules/services/nix-gc/default.nix
index 5dbe2da92..4b1206a22 100644
--- a/tests/modules/services/nix-gc/default.nix
+++ b/tests/modules/services/nix-gc/default.nix
@@ -1,5 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  nix-gc = ./basic.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/nix-gc/basic.nix b/tests/modules/services/nix-gc/linux/basic.nix
similarity index 100%
rename from tests/modules/services/nix-gc/basic.nix
rename to tests/modules/services/nix-gc/linux/basic.nix
diff --git a/tests/modules/services/nix-gc/linux/default.nix b/tests/modules/services/nix-gc/linux/default.nix
new file mode 100644
index 000000000..922d6a399
--- /dev/null
+++ b/tests/modules/services/nix-gc/linux/default.nix
@@ -0,0 +1,3 @@
+{
+  nix-gc = ./basic.nix;
+}
diff --git a/tests/modules/services/nix-gc/expected.service b/tests/modules/services/nix-gc/linux/expected.service
similarity index 100%
rename from tests/modules/services/nix-gc/expected.service
rename to tests/modules/services/nix-gc/linux/expected.service
diff --git a/tests/modules/services/nix-gc/expected.timer b/tests/modules/services/nix-gc/linux/expected.timer
similarity index 100%
rename from tests/modules/services/nix-gc/expected.timer
rename to tests/modules/services/nix-gc/linux/expected.timer
diff --git a/tests/modules/services/nix-gc/nix-gc-script-expected b/tests/modules/services/nix-gc/linux/nix-gc-script-expected
similarity index 100%
rename from tests/modules/services/nix-gc/nix-gc-script-expected
rename to tests/modules/services/nix-gc/linux/nix-gc-script-expected