diff --git a/bin/pt-archiver b/bin/pt-archiver
index 9090c2b3..7efbd13a 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -4684,8 +4684,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 1d6cac9e..ace8a7d1 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -3799,8 +3799,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index 2ab63a44..403355fc 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -3243,8 +3243,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index 06b1e85f..55a2e72f 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -4354,8 +4354,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 33695663..0d3b7730 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -4200,8 +4200,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-find b/bin/pt-find
index b4e651b9..9a1c9e28 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -3040,8 +3040,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index c127f001..86fede7a 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -2947,8 +2947,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 91b01ef9..9b63b52e 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -4124,8 +4124,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index c1444724..72438ea5 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -5706,8 +5706,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-kill b/bin/pt-kill
index fdadf65e..9e91e319 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -5715,8 +5715,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 51c0e35d..ed47e407 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -6737,8 +6737,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor
index 12854c18..574dda3c 100755
--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -6891,8 +6891,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 8227d75a..40c64b6c 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -12740,8 +12740,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index 2310e333..b38862f4 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -3356,8 +3356,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 0a0dad2f..9433c837 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -3979,8 +3979,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 15602ec5..bf363148 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -905,8 +905,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 0c245a5c..5bd88537 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -11181,8 +11181,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 2b2d2e99..4885ef7f 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -4268,8 +4268,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {
diff --git a/lib/Pingback.pm b/lib/Pingback.pm
index 1f6ad6fe..087a3c48 100644
--- a/lib/Pingback.pm
+++ b/lib/Pingback.pm
@@ -97,8 +97,10 @@ sub version_check {
          print "# Percona suggests these upgrades:\n";
          print join("\n", map { "#   * $_" } @$advice), "\n\n";
       }
-      elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('--version-check worked, but there were no suggestions');
+      else {
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
       }
    };
    if ( $EVAL_ERROR ) {