diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 18599437c825..c860c8a6a782 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -903,7 +903,7 @@ in {
   phylactery = handleTest ./web-apps/phylactery.nix {};
   pict-rs = handleTest ./pict-rs.nix {};
   pingvin-share = handleTest ./pingvin-share.nix {} ;
-  pinnwand = handleTest ./pinnwand.nix {};
+  pinnwand = runTest ./pinnwand.nix;
   plantuml-server = handleTest ./plantuml-server.nix {};
   plasma-bigscreen = handleTest ./plasma-bigscreen.nix {};
   plasma5 = handleTest ./plasma5.nix {};
diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix
index 0d3d9083c6ac..e7e62ee7dacc 100644
--- a/nixos/tests/pinnwand.nix
+++ b/nixos/tests/pinnwand.nix
@@ -1,102 +1,103 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  let
-    port = 8000;
-    baseUrl = "http://server:${toString port}";
-  in
-  {
-    name = "pinnwand";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ hexa ];
-    };
+{
+  pkgs,
+  ...
+}:
+let
+  port = 8000;
+  baseUrl = "http://server:${toString port}";
+in
+{
+  name = "pinnwand";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ hexa ];
+  };
 
-    nodes = {
-      server =
-        { config, ... }:
-        {
-          networking.firewall.allowedTCPPorts = [
-            port
-          ];
+  nodes = {
+    server =
+      { config, ... }:
+      {
+        networking.firewall.allowedTCPPorts = [
+          port
+        ];
 
-          services.pinnwand = {
-            enable = true;
-            port = port;
-          };
+        services.pinnwand = {
+          enable = true;
+          port = port;
         };
+      };
 
-      client =
-        { pkgs, ... }:
-        {
-          environment.systemPackages = [
-            pkgs.steck
+    client =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = [
+          pkgs.steck
 
-            (pkgs.writers.writePython3Bin "setup-steck.py"
-              {
-                libraries = with pkgs.python3.pkgs; [
-                  appdirs
-                  toml
-                ];
-                flakeIgnore = [
-                  "E501"
-                ];
+          (pkgs.writers.writePython3Bin "setup-steck.py"
+            {
+              libraries = with pkgs.python3.pkgs; [
+                appdirs
+                toml
+              ];
+              flakeIgnore = [
+                "E501"
+              ];
+            }
+            ''
+              import appdirs
+              import toml
+              import os
+
+              CONFIG = {
+                  "base": "${baseUrl}/",
+                  "confirm": False,
+                  "magic": True,
+                  "ignore": True
               }
-              ''
-                import appdirs
-                import toml
-                import os
 
-                CONFIG = {
-                    "base": "${baseUrl}/",
-                    "confirm": False,
-                    "magic": True,
-                    "ignore": True
-                }
+              os.makedirs(appdirs.user_config_dir('steck'))
+              with open(os.path.join(appdirs.user_config_dir('steck'), 'steck.toml'), "w") as fd:
+                  toml.dump(CONFIG, fd)
+            ''
+          )
+        ];
+      };
+  };
 
-                os.makedirs(appdirs.user_config_dir('steck'))
-                with open(os.path.join(appdirs.user_config_dir('steck'), 'steck.toml'), "w") as fd:
-                    toml.dump(CONFIG, fd)
-              ''
-            )
-          ];
-        };
-    };
+  testScript = ''
+    start_all()
 
-    testScript = ''
-      start_all()
+    server.wait_for_unit("pinnwand.service")
+    client.wait_for_unit("network.target")
 
-      server.wait_for_unit("pinnwand.service")
-      client.wait_for_unit("network.target")
+    # create steck.toml config file
+    client.succeed("setup-steck.py")
 
-      # create steck.toml config file
-      client.succeed("setup-steck.py")
+    # wait until the server running pinnwand is reachable
+    client.wait_until_succeeds("ping -c1 server")
 
-      # wait until the server running pinnwand is reachable
-      client.wait_until_succeeds("ping -c1 server")
+    # make sure pinnwand is listening
+    server.wait_for_open_port(${toString port})
 
-      # make sure pinnwand is listening
-      server.wait_for_open_port(${toString port})
+    # send the contents of /etc/machine-id
+    response = client.succeed("steck paste /etc/machine-id")
 
-      # send the contents of /etc/machine-id
-      response = client.succeed("steck paste /etc/machine-id")
+    # parse the steck response
+    raw_url = None
+    removal_link = None
+    for line in response.split("\n"):
+        if line.startswith("View link:"):
+            raw_url = f"${baseUrl}/raw/{line.split('/')[-1]}"
+        if line.startswith("Removal link:"):
+            removal_link = line.split(":", 1)[1]
 
-      # parse the steck response
-      raw_url = None
-      removal_link = None
-      for line in response.split("\n"):
-          if line.startswith("View link:"):
-              raw_url = f"${baseUrl}/raw/{line.split('/')[-1]}"
-          if line.startswith("Removal link:"):
-              removal_link = line.split(":", 1)[1]
+    # check whether paste matches what we sent
+    client.succeed(f"curl {raw_url} > /tmp/machine-id")
+    client.succeed("diff /tmp/machine-id /etc/machine-id")
 
-      # check whether paste matches what we sent
-      client.succeed(f"curl {raw_url} > /tmp/machine-id")
-      client.succeed("diff /tmp/machine-id /etc/machine-id")
+    # remove paste and check that it's not available any more
+    client.succeed(f"curl {removal_link}")
+    client.fail(f"curl --fail {raw_url}")
 
-      # remove paste and check that it's not available any more
-      client.succeed(f"curl {removal_link}")
-      client.fail(f"curl --fail {raw_url}")
-
-      server.log(server.execute("systemd-analyze security pinnwand | grep '✗'")[1])
-    '';
-  }
-)
+    server.log(server.execute("systemd-analyze security pinnwand | grep '✗'")[1])
+  '';
+}