diff --git a/Gemfile b/Gemfile
index 8c7a257..3f46561 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,27 +1,36 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test, :system_tests do
-  if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
-    gem 'puppet-openstack_spec_helper',
-        :path => '../..',
+  spec_helper_dir = '/home/zuul/src/opendev.org/openstack/puppet-openstack_spec_helper'
+  if File.directory?(spec_helper_dir)
+    if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
+      gem 'puppet-openstack_spec_helper',
+        :path    => '../..',
+        :require => 'false'
+    else
+      gem 'puppet-openstack_spec_helper',
+        :path    => spec_helper_dir,
         :require => 'false'
+    end
   else
+    spec_helper_version = ENV['ZUUL_BRANCH'] || "master"
     gem 'puppet-openstack_spec_helper',
-        :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
-        :require => 'false'
+      :git     => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
+      :ref     => spec_helper_version,
+      :require => 'false'
   end
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else
   gem 'facter', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false
 end
 
 # vim:ft=ruby