diff --git a/t/lib/bash/collect.sh b/t/lib/bash/collect.sh
index bc14d36f..998464f9 100644
--- a/t/lib/bash/collect.sh
+++ b/t/lib/bash/collect.sh
@@ -39,11 +39,12 @@ ls -1 $PT_TMPDIR/collect | sort > $PT_TMPDIR/collect-files
 # If this system has /proc, then some files should be collected.
 # Else, those files should not exist.
 if [ -f /proc/diskstats ]; then
+   wait_for_files "$p-diskstats"
    cmd_ok \
-      "grep -q '[0-9]' $PT_TMPDIR/collect/2011_12_05-diskstats" \
+      "grep -q '[0-9]' $p-diskstats" \
       "/proc/diskstats"
 else
-   test -f $PT_TMPDIR/collect/2011_12_05-diskstats
+   test -f $PT_TMPDIR/collect/$p-diskstats
    is "$?" "1" "No /proc/diskstats"
 fi
 
@@ -75,6 +76,8 @@ cmd_ok \
    "Finds MySQL error log"
 
 if [ "$(which lsof 2>/dev/null)" ]; then
+   wait_for_files "$p-lsof"
+      echo $(lsof -i ":${port}")
    cmd_ok \
       "grep -q 'COMMAND[ ]\+PID[ ]\+USER' $p-lsof" \
       "lsof"
diff --git a/t/pt-table-checksum/samples/default-results-5.7.txt b/t/pt-table-checksum/samples/default-results-5.7.txt
index 4fa0b0fb..4a20b01f 100644
--- a/t/pt-table-checksum/samples/default-results-5.7.txt
+++ b/t/pt-table-checksum/samples/default-results-5.7.txt
@@ -10,7 +10,6 @@ ERRORS DIFFS ROWS SKIPPED TABLE
 0 0 908 0 mysql.help_keyword
 0 0 1803 0 mysql.help_relation
 0 0 659 0 mysql.help_topic
-0 0 0 0 mysql.ndb_binlog_index
 0 0 0 0 mysql.plugin
 0 0 0 0 mysql.proc
 0 0 0 0 mysql.procs_priv