diff --git a/tests/modules/services/espanso/basic-configuration.nix b/tests/modules/services/espanso/basic-configuration.nix
index 51a1fee99..789e98f44 100644
--- a/tests/modules/services/espanso/basic-configuration.nix
+++ b/tests/modules/services/espanso/basic-configuration.nix
@@ -1,4 +1,5 @@
-{ ... }:
+espansoExtraArgs:
+{ config, ... }:
 
 {
   services.espanso = {
@@ -36,7 +37,7 @@
         ];
       };
     };
-  };
+  } // espansoExtraArgs;
 
   test.stubs.espanso = { };
 
diff --git a/tests/modules/services/espanso/default.nix b/tests/modules/services/espanso/default.nix
index 5df5fa3f1..81a6c7909 100644
--- a/tests/modules/services/espanso/default.nix
+++ b/tests/modules/services/espanso/default.nix
@@ -1 +1,11 @@
-{ espanso-basic-configuration = ./basic-configuration.nix; }
+{
+  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;
+  };
+}