diff --git a/t/lib/Cxn.t b/t/lib/Cxn.t
index b90fc626..9791c734 100644
--- a/t/lib/Cxn.t
+++ b/t/lib/Cxn.t
@@ -208,8 +208,7 @@ is(
    $hostname,
    'name() uses @@hostname'
 );
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+
 # ############################################################################
 # Default cxn, should be equivalent to 'h=localhost'.
 # ############################################################################
diff --git a/t/pt-config-diff/basics.t b/t/pt-config-diff/basics.t
index 42a7f294..0234ea07 100644
--- a/t/pt-config-diff/basics.t
+++ b/t/pt-config-diff/basics.t
@@ -166,5 +166,4 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-config-diff/reports.t b/t/pt-config-diff/reports.t
index 48c13718..740facaf 100644
--- a/t/pt-config-diff/reports.t
+++ b/t/pt-config-diff/reports.t
@@ -62,5 +62,4 @@ is(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-deadlock-logger/basics.t b/t/pt-deadlock-logger/basics.t
index 3d915390..866f4f6c 100644
--- a/t/pt-deadlock-logger/basics.t
+++ b/t/pt-deadlock-logger/basics.t
@@ -169,5 +169,4 @@ $dbh1->commit;
 $dbh2->commit;
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-deadlock-logger/clear_deadlocks.t b/t/pt-deadlock-logger/clear_deadlocks.t
index fef7baaa..e6d6fd86 100644
--- a/t/pt-deadlock-logger/clear_deadlocks.t
+++ b/t/pt-deadlock-logger/clear_deadlocks.t
@@ -67,5 +67,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-deadlock-logger/create_dest_table.t b/t/pt-deadlock-logger/create_dest_table.t
index 64456988..2a1668c4 100644
--- a/t/pt-deadlock-logger/create_dest_table.t
+++ b/t/pt-deadlock-logger/create_dest_table.t
@@ -55,5 +55,4 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-deadlock-logger/standard_options.t b/t/pt-deadlock-logger/standard_options.t
index 38ea83f8..cb360c7a 100644
--- a/t/pt-deadlock-logger/standard_options.t
+++ b/t/pt-deadlock-logger/standard_options.t
@@ -106,5 +106,4 @@ diag(`rm -rf /tmp/mk-deadlock-logger.pid`);
 # #############################################################################
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-duplicate-key-checker/basics.t b/t/pt-duplicate-key-checker/basics.t
index 89e5dab7..a15e7519 100644
--- a/t/pt-duplicate-key-checker/basics.t
+++ b/t/pt-duplicate-key-checker/basics.t
@@ -111,5 +111,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-duplicate-key-checker/clustered_keys.t b/t/pt-duplicate-key-checker/clustered_keys.t
index cd170677..5f8521f5 100644
--- a/t/pt-duplicate-key-checker/clustered_keys.t
+++ b/t/pt-duplicate-key-checker/clustered_keys.t
@@ -51,5 +51,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-duplicate-key-checker/issue_1192.t b/t/pt-duplicate-key-checker/issue_1192.t
index f115a0a9..fb61a0f6 100644
--- a/t/pt-duplicate-key-checker/issue_1192.t
+++ b/t/pt-duplicate-key-checker/issue_1192.t
@@ -52,5 +52,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-duplicate-key-checker/issue_298.t b/t/pt-duplicate-key-checker/issue_298.t
index 59cb56a6..81c4d891 100644
--- a/t/pt-duplicate-key-checker/issue_298.t
+++ b/t/pt-duplicate-key-checker/issue_298.t
@@ -43,5 +43,4 @@ unlike($output, qr/Use of uninitialized var/, 'Does not crash on undef var');
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-duplicate-key-checker/issue_331.t b/t/pt-duplicate-key-checker/issue_331.t
index bf90f0a9..070bd3a9 100644
--- a/t/pt-duplicate-key-checker/issue_331.t
+++ b/t/pt-duplicate-key-checker/issue_331.t
@@ -51,5 +51,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-duplicate-key-checker/issue_663.t b/t/pt-duplicate-key-checker/issue_663.t
index e7389dad..a8a3676c 100644
--- a/t/pt-duplicate-key-checker/issue_663.t
+++ b/t/pt-duplicate-key-checker/issue_663.t
@@ -49,5 +49,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-find/pt-find.t b/t/pt-find/pt-find.t
index dd5c071d..a6a5e52c 100644
--- a/t/pt-find/pt-find.t
+++ b/t/pt-find/pt-find.t
@@ -211,5 +211,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-fk-error-logger/basics.t b/t/pt-fk-error-logger/basics.t
index 38532cb5..2137783f 100644
--- a/t/pt-fk-error-logger/basics.t
+++ b/t/pt-fk-error-logger/basics.t
@@ -125,5 +125,4 @@ $dbh->do('DROP TABLE test.parent');
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-heartbeat/basics.t b/t/pt-heartbeat/basics.t
index de590b96..7de926d7 100644
--- a/t/pt-heartbeat/basics.t
+++ b/t/pt-heartbeat/basics.t
@@ -141,5 +141,4 @@ like(
 `rm $pid_file $sent_file 2>/dev/null`;
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-heartbeat/multi_update_mode.t b/t/pt-heartbeat/multi_update_mode.t
index 00b3a3ce..1c80d186 100644
--- a/t/pt-heartbeat/multi_update_mode.t
+++ b/t/pt-heartbeat/multi_update_mode.t
@@ -251,5 +251,4 @@ foreach my $port (@ports) {
 diag(`rm -rf /tmp/pt-heartbeat-sentinel >/dev/null`);
 $sb->wipe_clean($master_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-heartbeat/standard_options.t b/t/pt-heartbeat/standard_options.t
index 38afe2be..bcd270e4 100644
--- a/t/pt-heartbeat/standard_options.t
+++ b/t/pt-heartbeat/standard_options.t
@@ -52,5 +52,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-index-usage/basics.t b/t/pt-index-usage/basics.t
index 606cfe01..d67a8059 100644
--- a/t/pt-index-usage/basics.t
+++ b/t/pt-index-usage/basics.t
@@ -140,5 +140,4 @@ is(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-index-usage/save_results.t b/t/pt-index-usage/save_results.t
index 599e7e36..ebbd76fb 100644
--- a/t/pt-index-usage/save_results.t
+++ b/t/pt-index-usage/save_results.t
@@ -366,5 +366,4 @@ SKIP: {
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-ioprofile/pt-ioprofile.t b/t/pt-ioprofile/pt-ioprofile.t
index 1881dc03..45d448f5 100644
--- a/t/pt-ioprofile/pt-ioprofile.t
+++ b/t/pt-ioprofile/pt-ioprofile.t
@@ -71,5 +71,4 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/basics.t b/t/pt-kill/basics.t
index e4f5d2c3..f594d88c 100644
--- a/t/pt-kill/basics.t
+++ b/t/pt-kill/basics.t
@@ -85,5 +85,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/execute_command.t b/t/pt-kill/execute_command.t
index 43cedfae..1f6fe595 100644
--- a/t/pt-kill/execute_command.t
+++ b/t/pt-kill/execute_command.t
@@ -119,5 +119,4 @@ SKIP: {
 diag(`rm $out 2>/dev/null`);
 $sb->wipe_clean($master_dbh) if $master_dbh;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/kill.t b/t/pt-kill/kill.t
index 11851595..a14f21d8 100644
--- a/t/pt-kill/kill.t
+++ b/t/pt-kill/kill.t
@@ -121,5 +121,4 @@ is(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/match.t b/t/pt-kill/match.t
index 017054ad..aa65e223 100644
--- a/t/pt-kill/match.t
+++ b/t/pt-kill/match.t
@@ -174,5 +174,4 @@ SKIP: {
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/standard_options.t b/t/pt-kill/standard_options.t
index 8e6731af..f05ebc59 100644
--- a/t/pt-kill/standard_options.t
+++ b/t/pt-kill/standard_options.t
@@ -74,5 +74,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh) if $master_dbh;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-log-player/issue_799.t b/t/pt-log-player/issue_799.t
index 12e089d3..7eea4c29 100644
--- a/t/pt-log-player/issue_799.t
+++ b/t/pt-log-player/issue_799.t
@@ -57,5 +57,4 @@ is_deeply(
 $sb->wipe_clean($dbh);
 diag(`rm -rf ./session-results-*`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-log-player/issue_903.t b/t/pt-log-player/issue_903.t
index 60a7541e..ceeccd53 100644
--- a/t/pt-log-player/issue_903.t
+++ b/t/pt-log-player/issue_903.t
@@ -54,5 +54,4 @@ like(
 # #############################################################################
 diag(`rm -rf ./session-results-*`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-log-player/play.t b/t/pt-log-player/play.t
index 3e886924..9010646e 100644
--- a/t/pt-log-player/play.t
+++ b/t/pt-log-player/play.t
@@ -95,5 +95,4 @@ diag(`rm session-results-*.txt 2>/dev/null`);
 diag(`rm -rf $tmpdir 2>/dev/null`);
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-advisor/get_create_table.t b/t/pt-query-advisor/get_create_table.t
index 76986e7c..414b5487 100644
--- a/t/pt-query-advisor/get_create_table.t
+++ b/t/pt-query-advisor/get_create_table.t
@@ -76,5 +76,4 @@ is(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-advisor/review.t b/t/pt-query-advisor/review.t
index 367cb58f..95221078 100644
--- a/t/pt-query-advisor/review.t
+++ b/t/pt-query-advisor/review.t
@@ -99,5 +99,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/collect_and_report_cycles.t b/t/pt-query-digest/collect_and_report_cycles.t
index c7aa3686..d44aca00 100644
--- a/t/pt-query-digest/collect_and_report_cycles.t
+++ b/t/pt-query-digest/collect_and_report_cycles.t
@@ -68,5 +68,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/daemon.t b/t/pt-query-digest/daemon.t
index 2345c259..cc756451 100644
--- a/t/pt-query-digest/daemon.t
+++ b/t/pt-query-digest/daemon.t
@@ -68,5 +68,4 @@ SKIP: {
 # #############################################################################
 `rm $pid_file >/dev/null 2>&1`;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/execute.t b/t/pt-query-digest/execute.t
index afd3d3ac..e1400e3c 100644
--- a/t/pt-query-digest/execute.t
+++ b/t/pt-query-digest/execute.t
@@ -95,5 +95,4 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/explain.t b/t/pt-query-digest/explain.t
index 2eb9f30e..2edfc761 100644
--- a/t/pt-query-digest/explain.t
+++ b/t/pt-query-digest/explain.t
@@ -119,5 +119,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/explain_partitions.t b/t/pt-query-digest/explain_partitions.t
index 9cefde12..3671b4fc 100644
--- a/t/pt-query-digest/explain_partitions.t
+++ b/t/pt-query-digest/explain_partitions.t
@@ -48,5 +48,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/issue_1186.t b/t/pt-query-digest/issue_1186.t
index 3406afa6..a24837ef 100644
--- a/t/pt-query-digest/issue_1186.t
+++ b/t/pt-query-digest/issue_1186.t
@@ -50,5 +50,4 @@ ok(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/issue_360.t b/t/pt-query-digest/issue_360.t
index bfc0623b..b40745b8 100644
--- a/t/pt-query-digest/issue_360.t
+++ b/t/pt-query-digest/issue_360.t
@@ -55,5 +55,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/mirror.t b/t/pt-query-digest/mirror.t
index 63acd100..25a0f8c9 100644
--- a/t/pt-query-digest/mirror.t
+++ b/t/pt-query-digest/mirror.t
@@ -104,5 +104,4 @@ $dbh1->do('set global read_only=0');
 $dbh2->do('set global read_only=1');
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/processlist.t b/t/pt-query-digest/processlist.t
index 75ccc295..b1957b42 100644
--- a/t/pt-query-digest/processlist.t
+++ b/t/pt-query-digest/processlist.t
@@ -75,5 +75,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/review.t b/t/pt-query-digest/review.t
index d0d104a7..94131106 100644
--- a/t/pt-query-digest/review.t
+++ b/t/pt-query-digest/review.t
@@ -380,5 +380,4 @@ unlike(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/run_time.t b/t/pt-query-digest/run_time.t
index 3e9962ee..a7499006 100644
--- a/t/pt-query-digest/run_time.t
+++ b/t/pt-query-digest/run_time.t
@@ -165,5 +165,4 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/since_until.t b/t/pt-query-digest/since_until.t
index eb41af5e..b53ff1b7 100644
--- a/t/pt-query-digest/since_until.t
+++ b/t/pt-query-digest/since_until.t
@@ -87,5 +87,4 @@ SKIP: {
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-query-digest/standard_options.t b/t/pt-query-digest/standard_options.t
index 139c6dd4..0115ffeb 100644
--- a/t/pt-query-digest/standard_options.t
+++ b/t/pt-query-digest/standard_options.t
@@ -46,5 +46,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-show-grants/all_grants.t b/t/pt-show-grants/all_grants.t
index a48cbd5b..12bb7046 100644
--- a/t/pt-show-grants/all_grants.t
+++ b/t/pt-show-grants/all_grants.t
@@ -73,5 +73,4 @@ diag(`/tmp/12345/use -u root -e "DROP USER 'bob'\@'192.168.1.1'"`);
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-show-grants/basics.t b/t/pt-show-grants/basics.t
index f57835dc..88a31d65 100644
--- a/t/pt-show-grants/basics.t
+++ b/t/pt-show-grants/basics.t
@@ -98,5 +98,4 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-show-grants/issue_445.t b/t/pt-show-grants/issue_445.t
index cd0cf4f9..2ff3fec9 100644
--- a/t/pt-show-grants/issue_445.t
+++ b/t/pt-show-grants/issue_445.t
@@ -70,5 +70,4 @@ is(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-slave-delay/basics.t b/t/pt-slave-delay/basics.t
index 59947724..635823e2 100644
--- a/t/pt-slave-delay/basics.t
+++ b/t/pt-slave-delay/basics.t
@@ -89,5 +89,4 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-slave-delay/standard_options.t b/t/pt-slave-delay/standard_options.t
index c198e833..4cba95f5 100644
--- a/t/pt-slave-delay/standard_options.t
+++ b/t/pt-slave-delay/standard_options.t
@@ -99,5 +99,4 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-slave-find/pt-slave-find.t b/t/pt-slave-find/pt-slave-find.t
index 80585d7f..cab012cf 100644
--- a/t/pt-slave-find/pt-slave-find.t
+++ b/t/pt-slave-find/pt-slave-find.t
@@ -111,5 +111,4 @@ is(
 # #############################################################################
 diag(`rm -rf $outfile >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-slave-restart/pt-slave-restart.t b/t/pt-slave-restart/pt-slave-restart.t
index f6322348..6aeb2cbd 100644
--- a/t/pt-slave-restart/pt-slave-restart.t
+++ b/t/pt-slave-restart/pt-slave-restart.t
@@ -135,5 +135,4 @@ diag(`rm -f /tmp/pt-slave-re*`);
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/daemon.t b/t/pt-upgrade/daemon.t
index adc0ed8c..0ef3556f 100644
--- a/t/pt-upgrade/daemon.t
+++ b/t/pt-upgrade/daemon.t
@@ -49,5 +49,4 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/rewrite_non_select.t b/t/pt-upgrade/rewrite_non_select.t
index f6abe25f..450fb611 100644
--- a/t/pt-upgrade/rewrite_non_select.t
+++ b/t/pt-upgrade/rewrite_non_select.t
@@ -72,5 +72,4 @@ ok(
 $sb->wipe_clean($dbh1);
 $sb->wipe_clean($dbh2);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/skip_non_select.t b/t/pt-upgrade/skip_non_select.t
index c1772877..52a2360b 100644
--- a/t/pt-upgrade/skip_non_select.t
+++ b/t/pt-upgrade/skip_non_select.t
@@ -53,5 +53,4 @@ ok(
 $sb->wipe_clean($dbh1);
 $sb->wipe_clean($dbh2);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/warnings.t b/t/pt-upgrade/warnings.t
index d44f7eef..21f4c369 100644
--- a/t/pt-upgrade/warnings.t
+++ b/t/pt-upgrade/warnings.t
@@ -96,5 +96,4 @@ ok(
 $sb->wipe_clean($dbh1);
 $sb->wipe_clean($dbh2);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-variable-advisor/show_variables_online.t b/t/pt-variable-advisor/show_variables_online.t
index c7d940d3..07bf9102 100644
--- a/t/pt-variable-advisor/show_variables_online.t
+++ b/t/pt-variable-advisor/show_variables_online.t
@@ -57,5 +57,4 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;