diff --git a/tests/modules/services/emacs-darwin/default.nix b/tests/modules/services/emacs-darwin/default.nix
deleted file mode 100644
index 1c56a656f..000000000
--- a/tests/modules/services/emacs-darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  emacs-service-basic = ./basic.nix;
-}
diff --git a/tests/modules/services/emacs-darwin/basic.nix b/tests/modules/services/emacs/darwin/basic.nix
similarity index 100%
rename from tests/modules/services/emacs-darwin/basic.nix
rename to tests/modules/services/emacs/darwin/basic.nix
diff --git a/tests/modules/services/emacs/darwin/default.nix b/tests/modules/services/emacs/darwin/default.nix
new file mode 100644
index 000000000..ae05f444a
--- /dev/null
+++ b/tests/modules/services/emacs/darwin/default.nix
@@ -0,0 +1,3 @@
+{
+  emacs-service-basic = ./basic.nix;
+}
diff --git a/tests/modules/services/emacs-darwin/expected-agent.plist b/tests/modules/services/emacs/darwin/expected-agent.plist
similarity index 100%
rename from tests/modules/services/emacs-darwin/expected-agent.plist
rename to tests/modules/services/emacs/darwin/expected-agent.plist
diff --git a/tests/modules/services/emacs/default.nix b/tests/modules/services/emacs/default.nix
index 9673459e2..4b1206a22 100644
--- a/tests/modules/services/emacs/default.nix
+++ b/tests/modules/services/emacs/default.nix
@@ -1,11 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  emacs-service-27 = ./emacs-service-27.nix;
-  emacs-service-28 = ./emacs-service-28.nix;
-  emacs-service-28-after-graphical-session-target = ./emacs-service-28-after-graphical-session-target.nix;
-  emacs-socket-27 = ./emacs-socket-27.nix;
-  emacs-socket-28 = ./emacs-socket-28.nix;
-  emacs-default-editor = ./emacs-default-editor.nix;
-  emacs-socket-and-startWithUserSession = ./emacs-socket-and-startWithUserSession.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/emacs/linux/default.nix b/tests/modules/services/emacs/linux/default.nix
new file mode 100644
index 000000000..da2b8748c
--- /dev/null
+++ b/tests/modules/services/emacs/linux/default.nix
@@ -0,0 +1,9 @@
+{
+  emacs-service-27 = ./emacs-service-27.nix;
+  emacs-service-28 = ./emacs-service-28.nix;
+  emacs-service-28-after-graphical-session-target = ./emacs-service-28-after-graphical-session-target.nix;
+  emacs-socket-27 = ./emacs-socket-27.nix;
+  emacs-socket-28 = ./emacs-socket-28.nix;
+  emacs-default-editor = ./emacs-default-editor.nix;
+  emacs-socket-and-startWithUserSession = ./emacs-socket-and-startWithUserSession.nix;
+}
diff --git a/tests/modules/services/emacs/emacs-27-emacsclient.desktop b/tests/modules/services/emacs/linux/emacs-27-emacsclient.desktop
similarity index 100%
rename from tests/modules/services/emacs/emacs-27-emacsclient.desktop
rename to tests/modules/services/emacs/linux/emacs-27-emacsclient.desktop
diff --git a/tests/modules/services/emacs/emacs-28-emacsclient.desktop b/tests/modules/services/emacs/linux/emacs-28-emacsclient.desktop
similarity index 100%
rename from tests/modules/services/emacs/emacs-28-emacsclient.desktop
rename to tests/modules/services/emacs/linux/emacs-28-emacsclient.desktop
diff --git a/tests/modules/services/emacs/emacs-default-editor.nix b/tests/modules/services/emacs/linux/emacs-default-editor.nix
similarity index 100%
rename from tests/modules/services/emacs/emacs-default-editor.nix
rename to tests/modules/services/emacs/linux/emacs-default-editor.nix
diff --git a/tests/modules/services/emacs/emacs-default-editor.sh b/tests/modules/services/emacs/linux/emacs-default-editor.sh
similarity index 100%
rename from tests/modules/services/emacs/emacs-default-editor.sh
rename to tests/modules/services/emacs/linux/emacs-default-editor.sh
diff --git a/tests/modules/services/emacs/emacs-service-27.nix b/tests/modules/services/emacs/linux/emacs-service-27.nix
similarity index 100%
rename from tests/modules/services/emacs/emacs-service-27.nix
rename to tests/modules/services/emacs/linux/emacs-service-27.nix
diff --git a/tests/modules/services/emacs/emacs-service-28-after-graphical-session-target.nix b/tests/modules/services/emacs/linux/emacs-service-28-after-graphical-session-target.nix
similarity index 100%
rename from tests/modules/services/emacs/emacs-service-28-after-graphical-session-target.nix
rename to tests/modules/services/emacs/linux/emacs-service-28-after-graphical-session-target.nix
diff --git a/tests/modules/services/emacs/emacs-service-28.nix b/tests/modules/services/emacs/linux/emacs-service-28.nix
similarity index 100%
rename from tests/modules/services/emacs/emacs-service-28.nix
rename to tests/modules/services/emacs/linux/emacs-service-28.nix
diff --git a/tests/modules/services/emacs/emacs-service-emacs-after-graphical-session-target.service b/tests/modules/services/emacs/linux/emacs-service-emacs-after-graphical-session-target.service
similarity index 100%
rename from tests/modules/services/emacs/emacs-service-emacs-after-graphical-session-target.service
rename to tests/modules/services/emacs/linux/emacs-service-emacs-after-graphical-session-target.service
diff --git a/tests/modules/services/emacs/emacs-service-emacs.service b/tests/modules/services/emacs/linux/emacs-service-emacs.service
similarity index 100%
rename from tests/modules/services/emacs/emacs-service-emacs.service
rename to tests/modules/services/emacs/linux/emacs-service-emacs.service
diff --git a/tests/modules/services/emacs/emacs-socket-27-emacs.service b/tests/modules/services/emacs/linux/emacs-socket-27-emacs.service
similarity index 100%
rename from tests/modules/services/emacs/emacs-socket-27-emacs.service
rename to tests/modules/services/emacs/linux/emacs-socket-27-emacs.service
diff --git a/tests/modules/services/emacs/emacs-socket-27.nix b/tests/modules/services/emacs/linux/emacs-socket-27.nix
similarity index 100%
rename from tests/modules/services/emacs/emacs-socket-27.nix
rename to tests/modules/services/emacs/linux/emacs-socket-27.nix
diff --git a/tests/modules/services/emacs/emacs-socket-28-emacs.service b/tests/modules/services/emacs/linux/emacs-socket-28-emacs.service
similarity index 100%
rename from tests/modules/services/emacs/emacs-socket-28-emacs.service
rename to tests/modules/services/emacs/linux/emacs-socket-28-emacs.service
diff --git a/tests/modules/services/emacs/emacs-socket-28.nix b/tests/modules/services/emacs/linux/emacs-socket-28.nix
similarity index 100%
rename from tests/modules/services/emacs/emacs-socket-28.nix
rename to tests/modules/services/emacs/linux/emacs-socket-28.nix
diff --git a/tests/modules/services/emacs/emacs-socket-and-startWithUserSession.nix b/tests/modules/services/emacs/linux/emacs-socket-and-startWithUserSession.nix
similarity index 100%
rename from tests/modules/services/emacs/emacs-socket-and-startWithUserSession.nix
rename to tests/modules/services/emacs/linux/emacs-socket-and-startWithUserSession.nix
diff --git a/tests/modules/services/emacs/emacs-socket-emacs.socket b/tests/modules/services/emacs/linux/emacs-socket-emacs.socket
similarity index 100%
rename from tests/modules/services/emacs/emacs-socket-emacs.socket
rename to tests/modules/services/emacs/linux/emacs-socket-emacs.socket