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 2c8e403020..37afffb53a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -126,8 +126,16 @@
     name: chef-bundler-prep
     builders:
       - shell: |
+          #!/bin/bash -x
           mkdir -p .bundle
-          bundle install --path=.bundle --jobs 1 --retry 3 --verbose
+          grep -E .*berkshelf.*3\.\d*\.\d*.* Gemfile
+          if [ $? -eq 0 ]; then
+            # For Berkshelf 3.x use the system gecode 3.x libraries
+            sudo apt-get install -y libgecode-dev
+            USE_SYSTEM_GECODE=1 bundle install --path=.bundle --jobs 1 --retry 3 --verbose
+          else
+            bundle install --path=.bundle --jobs 1 --retry 3 --verbose
+          fi
 
 - builder:
     name: chef-berkshelf-prep
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index bc0f92e268..41ca893aef 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -445,6 +445,9 @@ jobs:
   # We're planning on Puppet 2.7 support to Spring 2015.
   - name: ^.*puppet-unit-2.7$
     parameter-function: set_node_options_default_precise
+  # Berkshelf 3.x requires GeCode 3.x on precise.
+  - name: ^gate-.*-chef-(lint|style|unit)$
+    parameter-function: set_node_options_default_precise
   # tempest and d-g branchless tests need to only run on master
   # (needs to be early to not impact non-voting stanzas later)
   - name: ^(?!periodic-).*(-icehouse|-havana)$