diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix
index abb7c4e5..cb3c3169 100644
--- a/lib/devos/mkHosts.nix
+++ b/lib/devos/mkHosts.nix
@@ -90,7 +90,7 @@ let
       lib = {
         lib = { inherit specialArgs; };
         lib.testModule = {
-          imports = builtins.attrValues modules;
+          imports = [ local ] ++ builtins.attrValues modules;
         };
       };
     in
diff --git a/lib/pkgs-lib/tests/default.nix b/lib/pkgs-lib/tests/default.nix
index 3c284683..d924a804 100644
--- a/lib/pkgs-lib/tests/default.nix
+++ b/lib/pkgs-lib/tests/default.nix
@@ -48,7 +48,7 @@ let
     };
 
     testScript = ''
-      machine.systemctl("is-system-running --wait")
+      ${host.config.networking.hostName}.systemctl("is-system-running --wait")
     '';
   };