diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 79c6719b40..6b598cef3f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -93,7 +93,14 @@
               cd "$MODULE"
             fi
           fi
-          rake lint 2>&1
+          if [ -f Gemfile ]; then
+            mkdir .bundled_gems
+            export GEM_HOME=`pwd`/.bundled_gems
+            bundle install
+            bundle exec rake lint 2>&1
+          else
+            rake lint 2>&1
+          fi
 
 - builder:
     name: puppet-syntax