diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 077989af66f8..5bb0105493ca 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -907,7 +907,10 @@ in
   kexec = runTest ./kexec.nix;
   keycloak = discoverTests (import ./keycloak.nix);
   keyd = handleTest ./keyd.nix { };
-  keymap = handleTest ./keymap.nix { };
+  keymap = import ./keymap.nix {
+    inherit pkgs runTest;
+    inherit (pkgs) lib;
+  };
   kimai = runTest ./kimai.nix;
   kismet = runTest ./kismet.nix;
   kiwix-serve = runTest ./kiwix-serve;
diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index 55c08a004a4e..3592ebadad0a 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -1,11 +1,9 @@
 {
-  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";
@@ -32,8 +30,8 @@ let
       extraConfig ? { },
       tests,
     }:
-    with pkgs.lib;
-    makeTest {
+    with lib;
+    runTest {
       name = "keymap-${layout}";
 
       nodes.machine.console.keyMap = mkOverride 900 layout;
@@ -105,7 +103,7 @@ let
     };
 
 in
-pkgs.lib.mapAttrs mkKeyboardTest {
+lib.mapAttrs mkKeyboardTest {
   azerty = {
     tests = {
       azqw.qwerty = [