diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9094d39f50..6858259f31 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,11 +34,9 @@ fallback.sh: fallback.nix
 nix-push.sh: dependencies.nix
 nix-pull.sh: dependencies.nix
 
-#TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \
-#  build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh verify.sh \
-#  nix-pull.sh
-
-TESTS = init.sh nix-push.sh nix-pull.sh
+TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \
+  build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh verify.sh \
+  nix-pull.sh
 
 XFAIL_TESTS =
 
diff --git a/tests/fallback.sh b/tests/fallback.sh
index 081e5695f4..ac4370c61b 100644
--- a/tests/fallback.sh
+++ b/tests/fallback.sh
@@ -5,7 +5,7 @@ outPath=$($TOP/src/nix-store/nix-store -q --fallback "$storeExpr")
 echo "output path is $outPath"
 
 # Register a non-existant substitute
-(echo $outPath && echo $TOP/no-such-program && echo 0) | $TOP/src/nix-store/nix-store --substitute
+(echo $outPath && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --substitute
 
 # Build the derivation
 $TOP/src/nix-store/nix-store -r --fallback "$storeExpr"
diff --git a/tests/substitutes.sh b/tests/substitutes.sh
index c0b61288a4..061f5f32af 100644
--- a/tests/substitutes.sh
+++ b/tests/substitutes.sh
@@ -7,7 +7,7 @@ outPath=$($TOP/src/nix-store/nix-store -qvv "$storeExpr")
 echo "output path is $outPath"
 
 regSub() {
-    (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute
+    (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute
 }
 
 # Register a substitute for the output path.
diff --git a/tests/substitutes2.sh b/tests/substitutes2.sh
index 56f2bab374..e48e12a8f4 100644
--- a/tests/substitutes2.sh
+++ b/tests/substitutes2.sh
@@ -7,7 +7,7 @@ outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$storeExpr")
 echo "output path is $outPath"
 
 regSub() {
-    (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute
+    (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute
 }
 
 # Register a substitute for the output path.