diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index c3165c3ea4d3..26a55bccbcfa 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1920,7 +1920,10 @@ in
     inherit pkgs runTest;
     inherit (pkgs) lib;
   };
-  wine = handleTest ./wine.nix { };
+  wine = import ./wine.nix {
+    inherit pkgs runTest;
+    inherit (pkgs) lib;
+  };
   wireguard = import ./wireguard {
     inherit pkgs runTest;
     inherit (pkgs) lib;
diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix
index ebf374750a83..dfb6d2fd1f7c 100644
--- a/nixos/tests/wine.nix
+++ b/nixos/tests/wine.nix
@@ -1,28 +1,25 @@
 {
-  system ? builtins.currentSystem,
-  pkgs ? import ../.. {
-    inherit system;
-    config = { };
-  },
+  pkgs,
+  lib,
+  runTest,
 }:
 
 let
-  inherit (pkgs.lib)
+  inherit (lib)
     concatMapStrings
     listToAttrs
     optionals
     optionalString
     ;
-  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
 
   hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe";
   hello64 = "${pkgs.pkgsCross.mingwW64.hello}/bin/hello.exe";
 
   makeWineTest = packageSet: exes: variant: rec {
     name = "${packageSet}-${variant}";
-    value = makeTest {
+    value = runTest {
       inherit name;
-      meta = with pkgs.lib.maintainers; {
+      meta = with lib.maintainers; {
         maintainers = [ chkno ];
       };
 
@@ -74,6 +71,6 @@ listToAttrs (
       ])
       # This wayland combination times out after spending many hours.
       # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux
-      (pkgs.lib.remove "wayland" variants)
+      (lib.remove "wayland" variants)
   )
 )