diff --git a/nixos/release.nix b/nixos/release.nix
index 094eacf70598..e19403eccb66 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -224,7 +224,4 @@ in {
         mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
           (import ./tests { inherit nixpkgs system; });
     in fold recursiveUpdate {} (map testsFor systems);
-    
-    
-  run-in-machine-tests = pkgs.lib.genAttrs systems (system: import ./tests/run-in-machine.nix { inherit nixpkgs system; });
 }
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index dc608b12d99e..16d45126de13 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -34,4 +34,5 @@ with import ../lib/testing.nix { inherit system minimal; };
   tomcat = makeTest (import ./tomcat.nix);
   #trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
+  runInMachine.test = import ./run-in-machine.nix { inherit system; };
 }