diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index 92c22111..f6d7480e 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -2571,7 +2571,7 @@ report_mysql_summary () {
       fi
    fi
 
-   local has_rocksdb=$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine')
+   local has_rocksdb="$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine')"
    if [ ! -z "$has_rocksdb" ]; then
        section "RocksDB"
        section_rocksdb "$dir/mysql-variables" "$dir/mysql-status"
diff --git a/lib/bash/report_mysql_info.sh b/lib/bash/report_mysql_info.sh
index 42cc43ef..05b0436e 100644
--- a/lib/bash/report_mysql_info.sh
+++ b/lib/bash/report_mysql_info.sh
@@ -1547,7 +1547,7 @@ report_mysql_summary () {
       fi
    fi
 
-   local has_rocksdb=$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine')
+   local has_rocksdb="$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine')"
    if [ ! -z "$has_rocksdb" ]; then
        section "RocksDB"
        section_rocksdb "$dir/mysql-variables" "$dir/mysql-status"
diff --git a/t/pt-stalk/plugin.t b/t/pt-stalk/plugin.t
index 53f019e8..3971d15b 100644
--- a/t/pt-stalk/plugin.t
+++ b/t/pt-stalk/plugin.t
@@ -70,5 +70,6 @@ foreach my $hook (qw(
 diag(`rm $pid_file 2>/dev/null`);
 diag(`rm $log_file 2>/dev/null`);
 diag(`rm -rf $dest 2>/dev/null`);
+$sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-stalk/pt-stalk-replication.t b/t/pt-stalk/pt-stalk-replication.t
index 345b9d79..5e65d1af 100644
--- a/t/pt-stalk/pt-stalk-replication.t
+++ b/t/pt-stalk/pt-stalk-replication.t
@@ -78,5 +78,6 @@ is(
 
 
 cleanup();
+$sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;