diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index c71655064c11..9e4b359e9215 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -208,7 +208,7 @@ in
   armagetronad = runTest ./armagetronad.nix;
   artalk = runTest ./artalk.nix;
   atd = runTest ./atd.nix;
-  atop = handleTest ./atop.nix { };
+  atop = import ./atop.nix { inherit pkgs runTest; };
   atticd = runTest ./atticd.nix;
   atuin = runTest ./atuin.nix;
   audiobookshelf = runTest ./audiobookshelf.nix;
diff --git a/nixos/tests/atop.nix b/nixos/tests/atop.nix
index d2372c80c3f9..376c44f9bd88 100644
--- a/nixos/tests/atop.nix
+++ b/nixos/tests/atop.nix
@@ -1,12 +1,9 @@
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
+  pkgs,
+  runTest,
+  ...
 }:
 
-with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
-
 let
   assertions = rec {
     path = program: path: ''
@@ -129,7 +126,7 @@ let
   };
 in
 {
-  justThePackage = makeTest {
+  justThePackage = runTest {
     name = "atop-justThePackage";
     nodes.machine = {
       environment.systemPackages = [ pkgs.atop ];
@@ -148,7 +145,7 @@ in
       ];
     inherit meta;
   };
-  defaults = makeTest {
+  defaults = runTest {
     name = "atop-defaults";
     nodes.machine = {
       programs.atop = {
@@ -169,7 +166,7 @@ in
       ];
     inherit meta;
   };
-  minimal = makeTest {
+  minimal = runTest {
     name = "atop-minimal";
     nodes.machine = {
       programs.atop = {
@@ -193,7 +190,7 @@ in
       ];
     inherit meta;
   };
-  netatop = makeTest {
+  netatop = runTest {
     name = "atop-netatop";
     nodes.machine = {
       programs.atop = {
@@ -215,7 +212,7 @@ in
       ];
     inherit meta;
   };
-  atopgpu = makeTest {
+  atopgpu = runTest {
     name = "atop-atopgpu";
     nodes.machine = {
       programs.atop = {
@@ -237,7 +234,7 @@ in
       ];
     inherit meta;
   };
-  everything = makeTest {
+  everything = runTest {
     name = "atop-everything";
     nodes.machine = {
       programs.atop = {