diff --git a/tests/modules/services/yubikey-agent-darwin/default.nix b/tests/modules/services/yubikey-agent-darwin/default.nix
deleted file mode 100644
index 7afa694c..00000000
--- a/tests/modules/services/yubikey-agent-darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  yubikey-agent-darwin = ./service.nix;
-}
diff --git a/tests/modules/services/yubikey-agent/darwin/default.nix b/tests/modules/services/yubikey-agent/darwin/default.nix
new file mode 100644
index 00000000..e4b00814
--- /dev/null
+++ b/tests/modules/services/yubikey-agent/darwin/default.nix
@@ -0,0 +1,3 @@
+{
+  yubikey-agent = ./service.nix;
+}
diff --git a/tests/modules/services/yubikey-agent-darwin/service.nix b/tests/modules/services/yubikey-agent/darwin/service.nix
similarity index 100%
rename from tests/modules/services/yubikey-agent-darwin/service.nix
rename to tests/modules/services/yubikey-agent/darwin/service.nix
diff --git a/tests/modules/services/yubikey-agent/default.nix b/tests/modules/services/yubikey-agent/default.nix
index 6f000315..4b1206a2 100644
--- a/tests/modules/services/yubikey-agent/default.nix
+++ b/tests/modules/services/yubikey-agent/default.nix
@@ -1,5 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  yubikey-agent = ./service.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/yubikey-agent/linux/default.nix b/tests/modules/services/yubikey-agent/linux/default.nix
new file mode 100644
index 00000000..e4b00814
--- /dev/null
+++ b/tests/modules/services/yubikey-agent/linux/default.nix
@@ -0,0 +1,3 @@
+{
+  yubikey-agent = ./service.nix;
+}
diff --git a/tests/modules/services/yubikey-agent/service.nix b/tests/modules/services/yubikey-agent/linux/service.nix
similarity index 100%
rename from tests/modules/services/yubikey-agent/service.nix
rename to tests/modules/services/yubikey-agent/linux/service.nix