diff --git a/bin/pt-archiver b/bin/pt-archiver
index 668560ee..e59ae56a 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -4741,8 +4741,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index e4fa4335..e2ea45a3 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -4415,8 +4415,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index a134e1a0..1098d5fd 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -3331,8 +3331,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index 3bcab973..4fa03e1c 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -4226,8 +4226,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 47ac2322..bb91af49 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -4087,8 +4087,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-find b/bin/pt-find
index 401bc331..21c0f0c7 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -2899,8 +2899,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index 697ae193..7092b6f0 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -2841,8 +2841,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 25411a2b..c347c4b7 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -4067,8 +4067,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 101f011b..69c251fa 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -5542,8 +5542,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-kill b/bin/pt-kill
index e4885333..75712f88 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -5764,8 +5764,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 1078ff2b..80f55a72 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -7214,8 +7214,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor
index 1e2ce079..6fc77b0a 100755
--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -7497,8 +7497,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 7d025b18..b8afbf8d 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -13126,8 +13126,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index 811a2d43..75c9db13 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -3442,8 +3442,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index d755989a..c145591e 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -4066,8 +4066,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 0038038e..9048f780 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -780,8 +780,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 869db420..a07305dc 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -8904,8 +8904,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 63f40fef..92edd3ec 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -11723,8 +11723,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index b8cc002f..6aa51591 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -4349,8 +4349,10 @@ sub version_check {
    my $instances = $args{instances} || [];
    my $instances_to_check;
 
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }
diff --git a/lib/VersionCheck.pm b/lib/VersionCheck.pm
index cea09b68..de9fcb53 100644
--- a/lib/VersionCheck.pm
+++ b/lib/VersionCheck.pm
@@ -106,8 +106,12 @@ sub version_check {
    # However, we do not want dev and testing to v-c, so even though this
    # sub is called, force should be false because $o->got('version-check')
    # is false, then check for a .bzr dir which indicates dev or testing. 
+   # ../.bzr is when a tool is ran from /bin/; ../../.bzr is when a tool
+   # is ran as a module from /t/<tool>/.
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
    if ( !$args{force} ) {
-      if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
          PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
          return;
       }