diff --git a/t/pt-slave-find/pt-slave-find.t b/t/pt-slave-find/pt-slave-find.t
index 1c41c56d..65f89ea2 100644
--- a/t/pt-slave-find/pt-slave-find.t
+++ b/t/pt-slave-find/pt-slave-find.t
@@ -17,16 +17,12 @@ require "$trunk/bin/pt-slave-find";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
-
-# Create slave2 as slave of slave1.
-diag(`/tmp/12347/stop >/dev/null 2>&1`);
-diag(`rm -rf /tmp/12347 >/dev/null 2>&1`);
-diag(`$trunk/sandbox/test-env reset`);
-diag(`$trunk/sandbox/start-sandbox slave 12347 12346 >/dev/null`);
+my $master_dbh  = $sb->get_dbh_for('master');
+my $slave_dbh   = $sb->get_dbh_for('slave1');
 my $slave_2_dbh = $sb->get_dbh_for('slave2');
 
+diag(`$trunk/sandbox/test-env reset`);
+
 if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
@@ -114,6 +110,4 @@ is(
 # Done.
 # #############################################################################
 diag(`rm -rf $outfile >/dev/null`);
-diag(`/tmp/12347/stop >/dev/null`);
-diag(`rm -rf /tmp/12347 >/dev/null`);
 exit;
diff --git a/t/pt-upgrade/basics.t b/t/pt-upgrade/basics.t
index 8fadf6cf..6d5c56b2 100644
--- a/t/pt-upgrade/basics.t
+++ b/t/pt-upgrade/basics.t
@@ -139,6 +139,7 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
+diag(`rm /tmp/left-outfile.txt /tmp/right-outfile.txt 2>/dev/null`);
 $sb->wipe_clean($dbh1);
 $sb->wipe_clean($dbh2);
 exit;