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 43fbea5777..a50bd2feb7 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -158,11 +158,6 @@
             mkdir -p .cookbooks
             bundle exec berks install --path=.cookbooks
           fi
-          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
-          if [ -z $COOKBOOK ]; then
-              echo "Cookbook name not defined in metadata.rb"
-              exit 1
-          fi
 
 - builder:
     name: chef-cookbook-rubocop
@@ -191,11 +186,10 @@
     builders:
       - shell: |
           #!/bin/bash -x
-          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           if grep chefspec: Strainerfile; then
               bundle exec strainer test --cookbooks-path=.cookbooks --only=chefspec
           else
-              bundle exec rspec .cookbooks/$COOKBOOK/spec
+              bundle exec rspec --format documentation
           fi
 
 - builder: