diff --git a/tests/modules/services/home-manager-auto-expire-darwin/default.nix b/tests/modules/services/home-manager-auto-expire-darwin/default.nix
deleted file mode 100644
index 2724369a..00000000
--- a/tests/modules/services/home-manager-auto-expire-darwin/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  darwin-home-manager-autoExpire-service-basic-configuration = ./basic-configuration.nix;
-  darwin-home-manager-autoExpire-frequency-assertion = ./frequency-assertion.nix;
-}
diff --git a/tests/modules/services/home-manager-auto-expire-darwin/basic-configuration.nix b/tests/modules/services/home-manager-auto-expire/darwin/basic-configuration.nix
similarity index 100%
rename from tests/modules/services/home-manager-auto-expire-darwin/basic-configuration.nix
rename to tests/modules/services/home-manager-auto-expire/darwin/basic-configuration.nix
diff --git a/tests/modules/services/home-manager-auto-expire/darwin/default.nix b/tests/modules/services/home-manager-auto-expire/darwin/default.nix
new file mode 100644
index 00000000..82173787
--- /dev/null
+++ b/tests/modules/services/home-manager-auto-expire/darwin/default.nix
@@ -0,0 +1,4 @@
+{
+  home-manager-autoExpire-service-basic-configuration = ./basic-configuration.nix;
+  home-manager-autoExpire-frequency-assertion = ./frequency-assertion.nix;
+}
diff --git a/tests/modules/services/home-manager-auto-expire-darwin/expected-agent.plist b/tests/modules/services/home-manager-auto-expire/darwin/expected-agent.plist
similarity index 100%
rename from tests/modules/services/home-manager-auto-expire-darwin/expected-agent.plist
rename to tests/modules/services/home-manager-auto-expire/darwin/expected-agent.plist
diff --git a/tests/modules/services/home-manager-auto-expire-darwin/frequency-assertion.nix b/tests/modules/services/home-manager-auto-expire/darwin/frequency-assertion.nix
similarity index 100%
rename from tests/modules/services/home-manager-auto-expire-darwin/frequency-assertion.nix
rename to tests/modules/services/home-manager-auto-expire/darwin/frequency-assertion.nix
diff --git a/tests/modules/services/home-manager-auto-expire/default.nix b/tests/modules/services/home-manager-auto-expire/default.nix
index 036e1213..4b1206a2 100644
--- a/tests/modules/services/home-manager-auto-expire/default.nix
+++ b/tests/modules/services/home-manager-auto-expire/default.nix
@@ -1,5 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  home-manager-auto-expire-basic-configuration = ./basic-configuration.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/home-manager-auto-expire/basic-configuration.nix b/tests/modules/services/home-manager-auto-expire/linux/basic-configuration.nix
similarity index 100%
rename from tests/modules/services/home-manager-auto-expire/basic-configuration.nix
rename to tests/modules/services/home-manager-auto-expire/linux/basic-configuration.nix
diff --git a/tests/modules/services/home-manager-auto-expire/linux/default.nix b/tests/modules/services/home-manager-auto-expire/linux/default.nix
new file mode 100644
index 00000000..f21fda75
--- /dev/null
+++ b/tests/modules/services/home-manager-auto-expire/linux/default.nix
@@ -0,0 +1,3 @@
+{
+  home-manager-auto-expire-basic-configuration = ./basic-configuration.nix;
+}