diff --git a/release.nix b/release.nix
index ef5d9f4923d8..63488d712bbd 100644
--- a/release.nix
+++ b/release.nix
@@ -243,5 +243,7 @@ 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/tests/default.nix b/tests/default.nix
index 35c03a3b7083..1a50d8e7e67f 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -33,5 +33,4 @@ with import ../lib/testing.nix { inherit system minimal; };
   tomcat = makeTest (import ./tomcat.nix);
   trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
-  run-in-machine = import ./run-in-machine.nix { inherit nixpkgs system; };
 }