diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5bad50b737d0..829a5a645971 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1314,7 +1314,7 @@ in {
     imports = [ ./zigbee2mqtt.nix ];
     _module.args.package = pkgs.zigbee2mqtt_2;
   };
-  zipline = handleTest ./zipline.nix {};
+  zipline = runTest ./zipline.nix;
   zoneminder = runTest ./zoneminder.nix;
   zookeeper = runTest ./zookeeper.nix;
   zram-generator = runTest ./zram-generator.nix;
diff --git a/nixos/tests/zipline.nix b/nixos/tests/zipline.nix
index f72d6dcca7c7..dfda9230ea7c 100644
--- a/nixos/tests/zipline.nix
+++ b/nixos/tests/zipline.nix
@@ -1,44 +1,42 @@
-import ./make-test-python.nix (
-  { lib, ... }:
-  {
-    name = "zipline";
-    meta.maintainers = with lib.maintainers; [ defelo ];
+{ lib, ... }:
+{
+  name = "zipline";
+  meta.maintainers = with lib.maintainers; [ defelo ];
 
-    nodes.machine = {
-      services.zipline = {
-        enable = true;
-        settings = {
-          CORE_HOSTNAME = "127.0.0.1";
-          CORE_PORT = 8000;
-        };
-        environmentFiles = [
-          (builtins.toFile "zipline.env" ''
-            CORE_SECRET=DMlouex3W0QLRbVwkUafNnNws5jpgRDX
-          '')
-        ];
+  nodes.machine = {
+    services.zipline = {
+      enable = true;
+      settings = {
+        CORE_HOSTNAME = "127.0.0.1";
+        CORE_PORT = 8000;
       };
-
-      networking.hosts."127.0.0.1" = [ "zipline.local" ];
+      environmentFiles = [
+        (builtins.toFile "zipline.env" ''
+          CORE_SECRET=DMlouex3W0QLRbVwkUafNnNws5jpgRDX
+        '')
+      ];
     };
 
-    testScript = ''
-      import json
-      import re
+    networking.hosts."127.0.0.1" = [ "zipline.local" ];
+  };
 
-      machine.wait_for_unit("zipline.service")
-      machine.wait_for_open_port(8000)
+  testScript = ''
+    import json
+    import re
 
-      resp = machine.succeed("curl zipline.local:8000/api/setup -v -X POST -H 'Content-Type: application/json' -d '{\"username\": \"administrator\", \"password\": \"password\"}' 2>&1")
-      data = json.loads(resp.splitlines()[-1])
-      assert data["firstSetup"] is True
-      assert data["user"]["username"] == "administrator"
-      assert data["user"]["role"] == "SUPERADMIN"
+    machine.wait_for_unit("zipline.service")
+    machine.wait_for_open_port(8000)
 
-      resp = machine.succeed("curl zipline.local:8000/api/auth/login -v -X POST -H 'Content-Type: application/json' -d '{\"username\": \"administrator\", \"password\": \"password\"}' 2>&1")
+    resp = machine.succeed("curl zipline.local:8000/api/setup -v -X POST -H 'Content-Type: application/json' -d '{\"username\": \"administrator\", \"password\": \"password\"}' 2>&1")
+    data = json.loads(resp.splitlines()[-1])
+    assert data["firstSetup"] is True
+    assert data["user"]["username"] == "administrator"
+    assert data["user"]["role"] == "SUPERADMIN"
 
-      assert (cookie := re.search(r"(?m)^< set-cookie: ([^;]*)", resp))
-      resp = machine.succeed(f"curl zipline.local:8000/api/user -H 'Cookie: {cookie[1]}'")
-      assert json.loads(resp)["user"]["id"] == data["user"]["id"]
-    '';
-  }
-)
+    resp = machine.succeed("curl zipline.local:8000/api/auth/login -v -X POST -H 'Content-Type: application/json' -d '{\"username\": \"administrator\", \"password\": \"password\"}' 2>&1")
+
+    assert (cookie := re.search(r"(?m)^< set-cookie: ([^;]*)", resp))
+    resp = machine.succeed(f"curl zipline.local:8000/api/user -H 'Cookie: {cookie[1]}'")
+    assert json.loads(resp)["user"]["id"] == data["user"]["id"]
+  '';
+}