4 files changed, 13 insertions, 14 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d540290b4..14662c20d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,10 +17,9 @@ dependencies.sh: dependencies.nix
 locking.sh: locking.nix
 parallel.sh: parallel.nix
 
-TESTS = init.sh simple.sh dependencies.sh parallel.sh
-#locking.sh parallel.sh
+TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh
 
-XFAIL_TESTS = parallel.sh
+XFAIL_TESTS =
 
 include ../substitute.mk
 
diff --git a/tests/locking.sh b/tests/locking.sh
index 5728aee93..ac515fcea 100644
--- a/tests/locking.sh
+++ b/tests/locking.sh
@@ -4,7 +4,7 @@ echo "store expr is $storeExpr"
 
 for i in $(seq 1 5); do
     echo "WORKER $i"
-    $TOP/src/nix-store/nix-store -rvvB "$storeExpr" &
+    $TOP/src/nix-store/nix-store -rvvvvvB "$storeExpr" &
 done
 
 sleep 5
diff --git a/tests/parallel.nix.in b/tests/parallel.nix.in
index 41d6776d1..29eac1752 100644
--- a/tests/parallel.nix.in
+++ b/tests/parallel.nix.in
@@ -11,9 +11,9 @@ let {
 
   a = mkDrv "a" [];
   b = mkDrv "b" [a];
-  c = mkDrv "c" [b];
-  d = mkDrv "d" [c];
+  c = mkDrv "c" [a];
+  d = mkDrv "d" [a];
   e = mkDrv "e" [b c d];
 
   body = e;
-}
-\ No newline at end of file
+}
diff --git a/tests/parallel.sh b/tests/parallel.sh
index 7040f7ad9..6a563ef2b 100644
--- a/tests/parallel.sh
+++ b/tests/parallel.sh
@@ -2,19 +2,19 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate parallel.nix)
 
 echo "store expr is $storeExpr"
 
-for i in $(seq 1 5); do
-    echo "WORKER $i"
-    $TOP/src/nix-store/nix-store -rvvB "$storeExpr" &
-done
+#for i in $(seq 1 5); do
+#    echo "WORKER $i"
+#    $TOP/src/nix-store/nix-store -rvvB "$storeExpr" &
+#done
 
-sleep 5
+#sleep 5
 
-outPath=$($TOP/src/nix-store/nix-store -qnfvvvvv "$storeExpr")
+outPath=$($TOP/src/nix-store/nix-store -qnfvvvvvvK "$storeExpr")
 
 echo "output path is $outPath"
 
 text=$(cat "$outPath")
-if test "$text" != "aabcade"; then exit 1; fi
+if test "$text" != "abacade"; then exit 1; fi
 
 if test "$(cat $SHARED.cur)" != 0; then exit 1; fi
 if test "$(cat $SHARED.max)" != 3; then exit 1; fi