diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index a2d98044c13e..b4994bfa0132 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-ensureDir $out
-
 if test -n "$bootable"; then
     bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
 fi
@@ -27,5 +25,9 @@ if test -n "$init"; then
 fi
 
 # !!! -f is a quick hack.
-mkisofs -r -J -o $out/$isoName $bootFlags \
+ensureDir $out/files
+mkisofs -r -J -o $out/files/$isoName $bootFlags \
     -graft-points $graftList
+
+ensureDir $out/nix-support
+echo $system > $out/nix-support/system
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index da1c25444010..69899180bafb 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -1,12 +1,16 @@
+{system ? __currentSystem}:
+
 rec {
 
-  pkgs = import ./pkgs/top-level/all-packages.nix {};
+  pkgs = import ./pkgs/top-level/all-packages.nix {inherit system;};
 
   pkgsDiet = import ./pkgs/top-level/all-packages.nix {
+    inherit system;
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
   pkgsStatic = import ./pkgs/top-level/all-packages.nix {
+    inherit system;
     bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
   };