diff --git a/playbooks/run-beaker-tests.yaml b/playbooks/run-beaker-tests.yaml
index 4d4fc8ebd..c9131dd58 100644
--- a/playbooks/run-beaker-tests.yaml
+++ b/playbooks/run-beaker-tests.yaml
@@ -44,16 +44,17 @@
           fi
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           if [ -f Gemfile ]; then
             ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
           system(cmd)
           EOF
-            $GEM_HOME/bin/bundle install --without system_tests --retry 3
-            $GEM_HOME/bin/bundle exec rspec spec/acceptance
+            $GEM_BIN_DIR/bundle install --without system_tests --retry 3
+            $GEM_BIN_DIR/bundle exec rspec spec/acceptance
           else
             gem install rake -n ./.bundled_gems/ --no-user-instal
             gem install beaker-rspec --no-user-install
diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml
index 9befbea33..cd8097e04 100644
--- a/playbooks/run-lint-tests.yaml
+++ b/playbooks/run-lint-tests.yaml
@@ -19,18 +19,19 @@
           fi
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           if [ -f Gemfile ]; then
             ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
           system(cmd)
           EOF
-            $GEM_HOME/bin/bundle install --without system_tests --retry 3
-            $GEM_HOME/bin/bundle exec rake lint 2>&1
+            $GEM_BIN_DIR/bundle install --without system_tests --retry 3
+            $GEM_BIN_DIR/bundle exec rake lint 2>&1
             if [ -f metadata.json ]; then
-              $GEM_HOME/bin/bundle exec rake metadata_lint 2>&1
+              $GEM_BIN_DIR/bundle exec rake metadata_lint 2>&1
             fi
           else
             gem install rake -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
diff --git a/playbooks/run-syntax-tests.yaml b/playbooks/run-syntax-tests.yaml
index 507d40430..baf9df639 100644
--- a/playbooks/run-syntax-tests.yaml
+++ b/playbooks/run-syntax-tests.yaml
@@ -5,18 +5,19 @@
           export PUPPET_GEM_VERSION='~> {{ puppet }}'
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
           system(cmd)
           EOF
-          $GEM_HOME/bin/bundle install --retry 3
+          $GEM_BIN_DIR/bundle install --retry 3
           # FUTURE_PARSER=yes is only supported by Puppet 3.x
           if [ "{{ puppet }}" -lt "4" ]; then
               export FUTURE_PARSER=yes
           fi
-          $GEM_HOME/bin/bundle exec rake syntax
+          $GEM_BIN_DIR/bundle exec rake syntax
         chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
\ No newline at end of file
+      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index cc007619b..3a084a169 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -8,14 +8,15 @@
           fi
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
           system(cmd)
           EOF
-          $GEM_HOME/bin/bundle install --retry 3
-          $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation'
+          $GEM_BIN_DIR/bundle install --retry 3
+          $GEM_BIN_DIR/bundle exec rake spec SPEC_OPTS='--format documentation'
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'