diff --git a/run-tests.sh b/run-tests.sh
index b1fda418..68a98291 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -11,5 +11,5 @@ for dir in t/*
 do 
     echo "$dir"
     sandbox/test-env restart
-    prove -vw "$dir" | tee -a $LOG_FILE
+    prove -vw --trap --timer "$dir" | tee -a $LOG_FILE
 done
diff --git a/t/pt-archiver/check_slave_lag.t b/t/pt-archiver/check_slave_lag.t
index 71432a55..cc817561 100644
--- a/t/pt-archiver/check_slave_lag.t
+++ b/t/pt-archiver/check_slave_lag.t
@@ -57,7 +57,8 @@ system('/tmp/12345/use -e "insert into issue_758.t select sleep(3)"');
 # Slave seems to be lagging now so the first row should get purged
 # immediately, then the script should wait about 2 seconds until
 # slave lag is gone.
-system("$cmd --source F=$cnf,D=issue_758,t=t --purge --where 'i>0' --check-slave-lag h=127.1,P=12346,u=msandbox,p=msandbox >/dev/null 2>&1 &");
+#system("$cmd --source F=$cnf,D=issue_758,t=t --purge --where 'i>0' --check-slave-lag h=127.1,P=12346,u=msandbox,p=msandbox >/dev/null 2>&1 &");
+system("$cmd --source F=$cnf,D=issue_758,t=t --purge --where 'i>0' --check-slave-lag h=127.1,P=12346,u=msandbox,p=msandbox &");
 
 sleep 1;
 is_deeply(
diff --git a/t/pt-online-schema-change/pt-229.t b/t/pt-online-schema-change/pt-229.t_
similarity index 100%
rename from t/pt-online-schema-change/pt-229.t
rename to t/pt-online-schema-change/pt-229.t_
diff --git a/t/pt-table-sync/issue_920.t b/t/pt-table-sync/issue_920.t_
similarity index 100%
rename from t/pt-table-sync/issue_920.t
rename to t/pt-table-sync/issue_920.t_
diff --git a/t/pt-table-sync/issue_96.t b/t/pt-table-sync/issue_96.t_
similarity index 100%
rename from t/pt-table-sync/issue_96.t
rename to t/pt-table-sync/issue_96.t_