diff --git a/tests/modules/services/espanso-darwin/default.nix b/tests/modules/services/espanso-darwin/default.nix
deleted file mode 100644
index 8b3de04e0..000000000
--- a/tests/modules/services/espanso-darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  espanso-darwin-basic-configuration = ./basic-configuration.nix;
-}
diff --git a/tests/modules/services/espanso-darwin/basic-configuration.nix b/tests/modules/services/espanso/darwin/basic-configuration.nix
similarity index 90%
rename from tests/modules/services/espanso-darwin/basic-configuration.nix
rename to tests/modules/services/espanso/darwin/basic-configuration.nix
index 0cd55b237..b63a7504a 100644
--- a/tests/modules/services/espanso-darwin/basic-configuration.nix
+++ b/tests/modules/services/espanso/darwin/basic-configuration.nix
@@ -52,10 +52,10 @@
 
     configFile=home-files/.config/espanso/config/default.yml
     assertFileExists "$configFile"
-    assertFileContent "$configFile" ${../espanso/basic-configuration.yaml}
+    assertFileContent "$configFile" ${./basic-configuration.yaml}
 
     matchFile=home-files/.config/espanso/match/base.yml
     assertFileExists "$matchFile"
-    assertFileContent "$matchFile" ${../espanso/basic-matches.yaml}
+    assertFileContent "$matchFile" ${./basic-matches.yaml}
   '';
 }
diff --git a/tests/modules/services/espanso/basic-configuration.yaml b/tests/modules/services/espanso/darwin/basic-configuration.yaml
similarity index 100%
rename from tests/modules/services/espanso/basic-configuration.yaml
rename to tests/modules/services/espanso/darwin/basic-configuration.yaml
diff --git a/tests/modules/services/espanso/basic-matches.yaml b/tests/modules/services/espanso/darwin/basic-matches.yaml
similarity index 100%
rename from tests/modules/services/espanso/basic-matches.yaml
rename to tests/modules/services/espanso/darwin/basic-matches.yaml
diff --git a/tests/modules/services/espanso/darwin/default.nix b/tests/modules/services/espanso/darwin/default.nix
new file mode 100644
index 000000000..9277ca384
--- /dev/null
+++ b/tests/modules/services/espanso/darwin/default.nix
@@ -0,0 +1,3 @@
+{
+  espanso-basic-configuration = ./basic-configuration.nix;
+}
diff --git a/tests/modules/services/espanso-darwin/launchd.plist b/tests/modules/services/espanso/darwin/launchd.plist
similarity index 100%
rename from tests/modules/services/espanso-darwin/launchd.plist
rename to tests/modules/services/espanso/darwin/launchd.plist
diff --git a/tests/modules/services/espanso/default.nix b/tests/modules/services/espanso/default.nix
index 25e61176f..4b1206a22 100644
--- a/tests/modules/services/espanso/default.nix
+++ b/tests/modules/services/espanso/default.nix
@@ -1,13 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  espanso-basic-configuration = import ./basic-configuration.nix { };
-  espanso-basic-configuration-wayland = import ./basic-configuration.nix {
-    waylandSupport = true;
-    x11Support = false;
-  };
-  espanso-basic-configuration-x11 = import ./basic-configuration.nix {
-    waylandSupport = false;
-    x11Support = true;
-  };
-}
+(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/espanso/basic-configuration.nix b/tests/modules/services/espanso/linux/basic-configuration.nix
similarity index 100%
rename from tests/modules/services/espanso/basic-configuration.nix
rename to tests/modules/services/espanso/linux/basic-configuration.nix
diff --git a/tests/modules/services/espanso/basic-configuration.service b/tests/modules/services/espanso/linux/basic-configuration.service
similarity index 100%
rename from tests/modules/services/espanso/basic-configuration.service
rename to tests/modules/services/espanso/linux/basic-configuration.service
diff --git a/tests/modules/services/espanso/linux/basic-configuration.yaml b/tests/modules/services/espanso/linux/basic-configuration.yaml
new file mode 100644
index 000000000..9dc9aa99d
--- /dev/null
+++ b/tests/modules/services/espanso/linux/basic-configuration.yaml
@@ -0,0 +1 @@
+show_notifications: false
diff --git a/tests/modules/services/espanso/linux/basic-matches.yaml b/tests/modules/services/espanso/linux/basic-matches.yaml
new file mode 100644
index 000000000..3cf98c989
--- /dev/null
+++ b/tests/modules/services/espanso/linux/basic-matches.yaml
@@ -0,0 +1,18 @@
+global_vars:
+- name: currentdate
+  params:
+    format: '%d/%m/%Y'
+  type: date
+- name: currenttime
+  params:
+    format: '%R'
+  type: date
+matches:
+- replace: It's {{currentdate}} {{currenttime}}
+  trigger: :now
+- replace: 'line1
+
+    line2'
+  trigger: :hello
+- regex: :hi(?P<person>.*)\.
+  replace: Hi {{person}}!
diff --git a/tests/modules/services/espanso/linux/default.nix b/tests/modules/services/espanso/linux/default.nix
new file mode 100644
index 000000000..81a6c7909
--- /dev/null
+++ b/tests/modules/services/espanso/linux/default.nix
@@ -0,0 +1,11 @@
+{
+  espanso-basic-configuration = import ./basic-configuration.nix { };
+  espanso-basic-configuration-wayland = import ./basic-configuration.nix {
+    waylandSupport = true;
+    x11Support = false;
+  };
+  espanso-basic-configuration-x11 = import ./basic-configuration.nix {
+    waylandSupport = false;
+    x11Support = true;
+  };
+}