diff --git a/tests/hyprland.nix b/tests/hyprland.nix
index ef79bb72..ad3c3c9b 100644
--- a/tests/hyprland.nix
+++ b/tests/hyprland.nix
@@ -5,9 +5,9 @@ in
 (import ./lib.nix) {
   name = "hyprland";
 
-  nodes.machine = { self, pkgs, ... }: {
+  nodes.machine = { nix-config, ... }: {
     imports = attrValues {
-      inherit (self.nixosModules) system desktop;
+      inherit (nix-config.nixosModules) system desktop;
     };
   };
 
diff --git a/tests/lib.nix b/tests/lib.nix
index a4de5139..7f90317e 100644
--- a/tests/lib.nix
+++ b/tests/lib.nix
@@ -1,14 +1,15 @@
-test: { pkgs, self }:
+test: { self, pkgs }:
 let
-  inherit (pkgs) lib;
+  inherit (pkgs.lib) mkDefault;
   nixos-lib = import (pkgs.path + "/nixos/lib") { };
 in
 (nixos-lib.runTest {
+  imports = [ test ];
+
   hostPkgs = pkgs;
-  defaults.documentation.enable = lib.mkDefault false;
+  defaults.documentation.enable = mkDefault false;
+
   node.specialArgs = {
-    inherit self;
     nix-config = self;
   };
-  imports = [ test ];
 }).config.result
diff --git a/tests/neovim.nix b/tests/neovim.nix
index ffd8ea60..550cc67d 100644
--- a/tests/neovim.nix
+++ b/tests/neovim.nix
@@ -5,9 +5,9 @@ in
 (import ./lib.nix) {
   name = "neovim";
 
-  nodes.machine = { self, pkgs, ... }: {
+  nodes.machine = { nix-config, ... }: {
     imports = attrValues {
-      inherit (self.nixosModules) system shell;
+      inherit (nix-config.nixosModules) system shell;
     };
   };