diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e1d0a62997da..345b8f2baeae 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -174,7 +174,7 @@ in {
   appliance-repart-image = runTest ./appliance-repart-image.nix;
   appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix;
   apparmor = runTest ./apparmor;
-  archi = handleTest ./archi.nix {};
+  archi = runTest ./archi.nix;
   aria2 = handleTest ./aria2.nix {};
   armagetronad = handleTest ./armagetronad.nix {};
   artalk = runTest ./artalk.nix;
diff --git a/nixos/tests/archi.nix b/nixos/tests/archi.nix
index 387c4093a8bb..74cca03829c5 100644
--- a/nixos/tests/archi.nix
+++ b/nixos/tests/archi.nix
@@ -1,38 +1,36 @@
-import ./make-test-python.nix (
-  { lib, ... }:
-  {
-    name = "archi";
-    meta.maintainers = with lib.maintainers; [ paumr ];
+{ lib, ... }:
+{
+  name = "archi";
+  meta.maintainers = with lib.maintainers; [ paumr ];
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        imports = [
-          ./common/x11.nix
-        ];
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      imports = [
+        ./common/x11.nix
+      ];
 
-        environment.systemPackages = with pkgs; [ archi ];
-      };
+      environment.systemPackages = with pkgs; [ archi ];
+    };
 
-    enableOCR = true;
+  enableOCR = true;
 
-    testScript = ''
-      machine.wait_for_x()
+  testScript = ''
+    machine.wait_for_x()
 
-      with subtest("createEmptyModel via CLI"):
-           machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate")
-           machine.copy_from_vm("smoke.archimate", "")
+    with subtest("createEmptyModel via CLI"):
+         machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate")
+         machine.copy_from_vm("smoke.archimate", "")
 
-      with subtest("UI smoketest"):
-           machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &")
-           machine.wait_for_window("Archi")
+    with subtest("UI smoketest"):
+         machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &")
+         machine.wait_for_window("Archi")
 
-           # wait till main UI is open
-           # since OCR seems to be buggy wait_for_text was replaced by sleep, issue: #302965
-           # machine.wait_for_text("Welcome to Archi")
-           machine.sleep(20)
+         # wait till main UI is open
+         # since OCR seems to be buggy wait_for_text was replaced by sleep, issue: #302965
+         # machine.wait_for_text("Welcome to Archi")
+         machine.sleep(20)
 
-           machine.screenshot("welcome-screen")
-    '';
-  }
-)
+         machine.screenshot("welcome-screen")
+  '';
+}