diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index fcff7af0..202e9006 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -708,7 +708,7 @@ setup_data_dir () {
    else
       if [ ! -d "$OPT_SAVE_DATA" ]; then
          mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
-      elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then
+      elif [ "$( ls "$OPT_SAVE_DATA" | wc -l )" != "0" ]; then
          die "--save-samples directory isn't empty, halting."
       fi
       touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"
diff --git a/bin/pt-summary b/bin/pt-summary
index b2a666e6..efbc84b0 100755
--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -625,7 +625,7 @@ setup_data_dir () {
    else
       if [ ! -d "$OPT_SAVE_DATA" ]; then
          mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
-      elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then
+      elif [ "$( ls "$OPT_SAVE_DATA" | wc -l )" != "0" ]; then
          die "--save-samples directory isn't empty, halting."
       fi
       touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"
@@ -939,7 +939,7 @@ find_release_and_kernel () { local PTFUNCNAME=find_release_and_kernel;
          || [ "${platform}" = "NetBSD"  ] \
          || [ "${platform}" = "OpenBSD" ]; then
       release="$(uname -r)"
-      kernel="$($CMD_SYSCTL -n kern.osrevision)"
+      kernel="$($CMD_SYSCTL -n "kern.osrevision")"
    elif [ "${platform}" = "SunOS" ]; then
       release="$(head -n1 /etc/release)"
       if [ -z "${release}" ]; then
@@ -1048,17 +1048,17 @@ find_virtualization_dmesg () { local PTFUNCNAME=find_virtualization_dmesg;
 
 dmidecode_system_info () { local PTFUNCNAME=dmidecode_system_info;
    if [ "${CMD_DMIDECODE}" ]; then
-      local vendor="$($CMD_DMIDECODE -s system-manufacturer 2>/dev/null | sed 's/ *$//g')"
+      local vendor="$($CMD_DMIDECODE -s "system-manufacturer" 2>/dev/null | sed 's/ *$//g')"
       echo "vendor    ${vendor}"
       if [ "${vendor}" ]; then
-         local product="$($CMD_DMIDECODE -s system-product-name 2>/dev/null | sed 's/ *$//g')"
-         local version="$($CMD_DMIDECODE -s system-version 2>/dev/null | sed 's/ *$//g')"
-         local chassis="$($CMD_DMIDECODE -s chassis-type 2>/dev/null | sed 's/ *$//g')"
-         local servicetag="$($CMD_DMIDECODE -s system-serial-number 2>/dev/null | sed 's/ *$//g')"
+         local product="$($CMD_DMIDECODE -s "system-product-name" 2>/dev/null | sed 's/ *$//g')"
+         local version="$($CMD_DMIDECODE -s "system-version" 2>/dev/null | sed 's/ *$//g')"
+         local chassis="$($CMD_DMIDECODE -s "chassis-type" 2>/dev/null | sed 's/ *$//g')"
+         local servicetag="$($CMD_DMIDECODE -s "system-serial-number" 2>/dev/null | sed 's/ *$//g')"
          local system="${vendor}; ${product}; v${version} (${chassis})"
 
          echo "system    ${system}"
-         echo "servicetag    ${servicetag:-Not found}"
+         echo "servicetag    ${servicetag:-"Not found"}"
       fi
    fi
 }
diff --git a/lib/bash/summary_common.sh b/lib/bash/summary_common.sh
index 0df75194..03eb123d 100644
--- a/lib/bash/summary_common.sh
+++ b/lib/bash/summary_common.sh
@@ -133,7 +133,7 @@ setup_data_dir () {
       # Check the user's --save-data dir.
       if [ ! -d "$OPT_SAVE_DATA" ]; then
          mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
-      elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then
+      elif [ "$( ls "$OPT_SAVE_DATA" | wc -l )" != "0" ]; then
          die "--save-samples directory isn't empty, halting."
       fi
       touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"
diff --git a/t/lib/bash/report_system_info.sh b/t/lib/bash/report_system_info.sh
index 509ff7ea..6059bc75 100644
--- a/t/lib/bash/report_system_info.sh
+++ b/t/lib/bash/report_system_info.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-plan 46
+plan 49
 
 . "$LIB_DIR/alt_cmds.sh"
 . "$LIB_DIR/log_warn_die.sh"
diff --git a/t/pt-mysql-summary/pt-mysql-summary.t b/t/pt-mysql-summary/pt-mysql-summary.t
index 564dca58..020424ce 100644
--- a/t/pt-mysql-summary/pt-mysql-summary.t
+++ b/t/pt-mysql-summary/pt-mysql-summary.t
@@ -14,8 +14,8 @@ use PerconaTest;
 
 my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
 
-use Test::More tests => 7;
-use File::Temp qw( tempfile tempdir );
+use Test::More tests => 6;
+use File::Temp qw( tempdir );
 
 local $ENV{PTDEBUG} = "";
 
@@ -23,7 +23,7 @@ local $ENV{PTDEBUG} = "";
 # --save-samples
 #
 
-my $dir = tempdir( CLEANUP => 1 );
+my $dir = tempdir( "percona-testXXXXXXXX", CLEANUP => 1 );
 
 `$trunk/bin/$tool --sleep 1 --save-samples $dir`;
 
@@ -40,17 +40,6 @@ is(
    "And leaves all files in there"
 );
 
-`$trunk/bin/$tool --sleep 1 --save-samples $dir`;
-
-open my $fh, "<", "$dir/mysql-variables" or die "Can't open file: $!";
-my $data = do { local $/; <$fh> };
-unlike(
-   $data,
-   qr/pt-summary-internal-symbols.*pt-summary-internal-symbols/s,
-   "--save-samples doesn't re-use files if they already exist"
-);
-close $fh;
-
 undef($dir);
 
 #
@@ -77,8 +66,6 @@ for my $i (2..4) {
       ),
       "--read-samples works for t/pt-mysql-summary/temp00$i",
    );
-
-   close $fh;
 }
 
 exit;