diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0e4e2fa3447f..47c566171e56 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -912,7 +912,10 @@ in
   keter = runTest ./keter.nix;
   kexec = runTest ./kexec.nix;
   keycloak = discoverTests (import ./keycloak.nix);
-  keyd = handleTest ./keyd.nix { };
+  keyd = import ./keyd.nix {
+    inherit pkgs runTest;
+    inherit (pkgs) lib;
+  };
   keymap = import ./keymap.nix {
     inherit pkgs runTest;
     inherit (pkgs) lib;
diff --git a/nixos/tests/keyd.nix b/nixos/tests/keyd.nix
index 7dc07568be0c..81576fac2346 100644
--- a/nixos/tests/keyd.nix
+++ b/nixos/tests/keyd.nix
@@ -1,12 +1,10 @@
 # The test template is taken from the `./keymap.nix`
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
+  pkgs,
+  runTest,
+  lib,
 }:
 
-with import ../lib/testing-python.nix { inherit system pkgs; };
-
 let
   readyFile = "/tmp/readerReady";
   resultFile = "/tmp/readerResult";
@@ -29,8 +27,8 @@ let
   mkKeyboardTest =
     name:
     { default, test }:
-    with pkgs.lib;
-    makeTest {
+
+    runTest {
       inherit name;
 
       nodes.machine = {
@@ -72,7 +70,7 @@ let
     };
 
 in
-pkgs.lib.mapAttrs mkKeyboardTest {
+lib.mapAttrs mkKeyboardTest {
   swap-ab_and_ctrl-as-shift = {
     test.press = [
       "a"