diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 4e50353c..2af3b8f4 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -4371,10 +4371,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -4414,12 +4415,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -4467,15 +4470,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index 9b61cb17..d5ce802a 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -3287,10 +3287,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -3330,12 +3331,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -3383,15 +3386,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index 8681584f..f6e61842 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -4182,10 +4182,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -4225,12 +4226,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -4278,15 +4281,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 563cd7ad..164b6c23 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -4043,10 +4043,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -4086,12 +4087,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -4139,15 +4142,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-find b/bin/pt-find
index 88d7129a..77ad35e2 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -2855,10 +2855,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -2898,12 +2899,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -2951,15 +2954,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index b99676b6..b10429b3 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -2797,10 +2797,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -2840,12 +2841,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -2893,15 +2896,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 69b36e0f..a2c1447b 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -4023,10 +4023,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -4066,12 +4067,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -4119,15 +4122,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 4948bf19..0ee527be 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -5498,10 +5498,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -5541,12 +5542,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -5594,15 +5597,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-kill b/bin/pt-kill
index a675e6de..d53c8b9b 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -5720,10 +5720,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -5763,12 +5764,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -5816,15 +5819,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index b0977729..fb8cbd18 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -7170,10 +7170,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -7213,12 +7214,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -7266,15 +7269,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor
index a443e2c5..4c5cd3d8 100755
--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -7453,10 +7453,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -7496,12 +7497,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -7549,15 +7552,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index f0b54c28..bfc1c3f4 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -13082,10 +13082,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -13125,12 +13126,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -13178,15 +13181,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index cf93931a..f290bd46 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -3398,10 +3398,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -3441,12 +3442,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -3494,15 +3497,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 5a5fb282..14579abf 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -4022,10 +4022,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -4065,12 +4066,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -4118,15 +4121,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 0d2f06d7..790c3c5e 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -736,10 +736,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -779,12 +780,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -832,15 +835,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index c834a725..e0f0fb32 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -8860,10 +8860,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -8903,12 +8904,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -8956,15 +8959,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 5cfe3c3b..372a58f4 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -11679,10 +11679,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -11722,12 +11723,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -11775,15 +11778,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 54907354..b0530ab5 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -4305,10 +4305,11 @@ local $Data::Dumper::Indent    = 1;
 local $Data::Dumper::Sortkeys  = 1;
 local $Data::Dumper::Quotekeys = 0;
 
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
 use File::Basename qw();
 use File::Spec;
+use FindBin qw();
 
 eval {
    require Percona::Toolkit;
@@ -4348,12 +4349,14 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
-   eval {
-      if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-         PTDEBUG && _d('--version-check disabled by PERCONA_VERSION_CHECK=0');
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
+   }
 
+   eval {
       foreach my $instance ( @$instances ) {
          my ($name, $id) = get_instance_id($instance);
          $instance->{name} = $name;
@@ -4401,15 +4404,17 @@ sub version_check {
       PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
    }
 
-   eval {
-      update_check_times(
-         instances => $instances_to_check,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
    }
 
    if ( $ENV{PTDEBUG_VERSION_CHECK} ) {