diff --git a/tests/modules/services/imapnotify-darwin/default.nix b/tests/modules/services/imapnotify-darwin/default.nix
deleted file mode 100644
index 0ff49fd4b..000000000
--- a/tests/modules/services/imapnotify-darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  imapnotify-launchd = ./launchd.nix;
-}
diff --git a/tests/modules/services/imapnotify/darwin/default.nix b/tests/modules/services/imapnotify/darwin/default.nix
new file mode 100644
index 000000000..c1dbc27b4
--- /dev/null
+++ b/tests/modules/services/imapnotify/darwin/default.nix
@@ -0,0 +1,3 @@
+{
+  imapnotify-launchd = ./launchd.nix;
+}
diff --git a/tests/modules/services/imapnotify-darwin/launchd.nix b/tests/modules/services/imapnotify/darwin/launchd.nix
similarity index 93%
rename from tests/modules/services/imapnotify-darwin/launchd.nix
rename to tests/modules/services/imapnotify/darwin/launchd.nix
index f47ce76e5..1d7a4e95b 100644
--- a/tests/modules/services/imapnotify-darwin/launchd.nix
+++ b/tests/modules/services/imapnotify/darwin/launchd.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../../accounts/email-test-accounts.nix ];
+  imports = [ ../../../accounts/email-test-accounts.nix ];
 
   accounts.email.accounts = {
     "hm@example.com" = {
diff --git a/tests/modules/services/imapnotify-darwin/launchd.plist b/tests/modules/services/imapnotify/darwin/launchd.plist
similarity index 100%
rename from tests/modules/services/imapnotify-darwin/launchd.plist
rename to tests/modules/services/imapnotify/darwin/launchd.plist
diff --git a/tests/modules/services/imapnotify/default.nix b/tests/modules/services/imapnotify/default.nix
index ecb463d3d..4b1206a22 100644
--- a/tests/modules/services/imapnotify/default.nix
+++ b/tests/modules/services/imapnotify/default.nix
@@ -1,5 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  imapnotify = ./imapnotify.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/imapnotify/linux/default.nix b/tests/modules/services/imapnotify/linux/default.nix
new file mode 100644
index 000000000..ca7ecc86c
--- /dev/null
+++ b/tests/modules/services/imapnotify/linux/default.nix
@@ -0,0 +1,3 @@
+{
+  imapnotify = ./imapnotify.nix;
+}
diff --git a/tests/modules/services/imapnotify/imapnotify-config.json b/tests/modules/services/imapnotify/linux/imapnotify-config.json
similarity index 100%
rename from tests/modules/services/imapnotify/imapnotify-config.json
rename to tests/modules/services/imapnotify/linux/imapnotify-config.json
diff --git a/tests/modules/services/imapnotify/imapnotify.nix b/tests/modules/services/imapnotify/linux/imapnotify.nix
similarity index 94%
rename from tests/modules/services/imapnotify/imapnotify.nix
rename to tests/modules/services/imapnotify/linux/imapnotify.nix
index 68ae52eb7..63dd313f4 100644
--- a/tests/modules/services/imapnotify/imapnotify.nix
+++ b/tests/modules/services/imapnotify/linux/imapnotify.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../../accounts/email-test-accounts.nix ];
+  imports = [ ../../../accounts/email-test-accounts.nix ];
 
   accounts.email.accounts = {
     "hm@example.com" = {
diff --git a/tests/modules/services/imapnotify/imapnotify.service b/tests/modules/services/imapnotify/linux/imapnotify.service
similarity index 100%
rename from tests/modules/services/imapnotify/imapnotify.service
rename to tests/modules/services/imapnotify/linux/imapnotify.service