diff --git a/test/basic b/test/basic
index 309779ca..b4410f2a 100755
--- a/test/basic
+++ b/test/basic
@@ -71,6 +71,7 @@ output=$(cd ..; ./test-verbose -v 2>&1 | suppress_diff_date)
 expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date)
 # Do not include the results of test-verbose in totals
 rm $TEST_DIRECTORY/test-results/test-verbose-*
+rm -r $TEST_DIRECTORY/tmp.test-verbose
 test_expect_equal "$output" "$expected"
 
 
diff --git a/test/test-lib.sh b/test/test-lib.sh
index da91de8d..a1978279 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -454,6 +454,9 @@ test_expect_equal_failure ()
 			test_known_broken_ok_ "$test_subtest_name"
 		else
 			test_known_broken_failure_ "$test_subtest_name"
+			testname=$this_test.$test_count
+			echo "$expected" > $testname.expected
+			echo "$output" > $testname.output
 		fi
     fi
 }
@@ -754,7 +757,9 @@ test_done () {
 	echo
 
 	if [ "$test_failure" = "0" ]; then
-	    rm -rf "$remove_tmp"
+	    if [ "$test_broken" = "0" ]; then	    
+		rm -rf "$remove_tmp"
+	    fi
 	    exit 0
 	else
 	    exit 1