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 0f011b5a52..6a4a38adc6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -141,20 +141,32 @@
     builders:
       - shell: |
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
-          ruby1.9.1 /usr/bin/bundle exec rubocop
+          if grep rubocop: Strainerfile; then
+              ruby1.9.1 /usr/bin/bundle exec strainer test -o rubocop
+          else
+              ruby1.9.1 /usr/bin/bundle exec ruby1.9.1 /usr/bin/bundle exec rubocop
+          fi
 
 - builder:
     name: chef-cookbook-foodcritic
     builders:
       - shell: |
-          ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .
+          if grep foodcritic: Strainerfile; then
+              ruby1.9.1 /usr/bin/bundle exec strainer test -o foodcritic
+          else
+              ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .
+          fi
 
 - builder:
     name: chef-cookbook-chefspec
     builders:
       - shell: |
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
-          ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK/spec
+          if grep chefspec: Strainerfile; then
+              ruby1.9.1 /usr/bin/bundle exec strainer test -o chefspec
+          else
+              ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK/spec
+          fi
 
 - builder:
     name: run-tests