diff --git a/t/pt-heartbeat/basics.t b/t/pt-heartbeat/basics.t
index 60dccf3b..a320a232 100644
--- a/t/pt-heartbeat/basics.t
+++ b/t/pt-heartbeat/basics.t
@@ -137,5 +137,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
+diag(`rm /tmp/pt-heartbeat-sentinel 2>/dev/null`);
 $sb->wipe_clean($dbh);
 exit;
diff --git a/t/pt-heartbeat/multi_update_mode.t b/t/pt-heartbeat/multi_update_mode.t
index 06ac02d7..af6190db 100644
--- a/t/pt-heartbeat/multi_update_mode.t
+++ b/t/pt-heartbeat/multi_update_mode.t
@@ -16,9 +16,7 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-heartbeat";
 
-diag(`$trunk/sandbox/test-env reset`);  # don't repl sakila db to 12347
-diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
-diag(`$trunk/sandbox/start-sandbox slave 12347 12346 >/dev/null`);
+diag(`$trunk/sandbox/test-env reset`);
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -225,6 +223,7 @@ $output = output(
    sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
       qw(-D test --check --print-master-server-id --master-server-id 42),
       qw(--no-insert-heartbeat-row)) },
+   stderr => 1,
 );
 
 like(
@@ -246,11 +245,9 @@ foreach my $port (@ports) {
    );
 }
 
-diag(`rm -rf /tmp/mk-heartbeat-sentinel >/dev/null`);
-diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
-
 # #############################################################################
 # Done.
 # #############################################################################
+diag(`rm -rf /tmp/pt-heartbeat-sentinel >/dev/null`);
 $sb->wipe_clean($master_dbh);
 exit;