diff --git a/config_defaults.yml b/config_defaults.yml
index 3ca3da8..9d436f2 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -1,9 +1,4 @@
 ---
-Gemfile:
-  required:
-    ':development, :test, :system_tests':
-      - gem: 'puppet-openstack_spec_helper'
-        git: 'https://git.openstack.org/openstack/puppet-openstack_spec_helper'
 Rakefile:
   default_disabled_lint_checks:
   - '80chars'
diff --git a/moduleroot/Gemfile b/moduleroot/Gemfile
index 4e7328c..def52b6 100644
--- a/moduleroot/Gemfile
+++ b/moduleroot/Gemfile
@@ -1,30 +1,17 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-<% groups = {} -%>
-<% (@configs['required'].keys + ((@configs['optional'] || {}).keys)).uniq.each do |key| -%>
-<%   groups[key] = (@configs['required'][key] || []) + ((@configs['optional'] || {})[key] || []) -%>
-<% end -%>
-<% -%>
-<% groups.each do |group, gems| -%>
-group <%= group %> do
-<% maxlen = gems.map! do |gem| -%>
-<%            { -%>
-<%              'gem'     => gem['gem'], -%>
-<%              'version' => gem['version'], -%>
-<%              'require' => gem['require'], -%>
-<%              'git'     => gem['git'], -%>
-<%              'branch'  => gem['branch'], -%>
-<%              'length'  => gem['gem'].length + (("', '".length if gem['version']) || 0) + gem['version'].to_s.length -%>
-<%            } -%>
-<%          end.map do |gem| -%>
-<%            gem['length'] -%>
-<%          end.max -%>
-<% gems.each do |gem| -%>
-  gem '<%= gem['gem'] %>'<%= ", '#{gem['version']}'" if gem['version'] %>, <%= ' ' * (maxlen - gem['length']) %><%= ":require => '#{gem['require'] || false}'" %><%= ", :git => '#{gem['git']}'" if gem['git'] %><%= ", :branch => '#{gem['branch']}'" if gem['branch'] %>
-<% end -%>
+group :development, :test, :system_tests do
+  if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
+    gem 'puppet-openstack_spec_helper',
+        :path => '../..',
+        :require => 'false'
+  else
+    gem 'puppet-openstack_spec_helper',
+        :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
+        :require => 'false'
+  end
 end
 
-<% end -%>
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else
diff --git a/moduleroot/bindep.txt b/moduleroot/bindep.txt
index 7cdd58e..d6645f8 100644
--- a/moduleroot/bindep.txt
+++ b/moduleroot/bindep.txt
@@ -1,5 +1,5 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
-# see http://docs.openstack.org/infra/bindep/ for additional information.
+# see https://docs.openstack.org/infra/bindep/ for additional information.
 
 libxml2-devel [test platform:rpm]
 libxml2-dev [test platform:dpkg]
@@ -9,3 +9,4 @@ ruby-devel [test platform:rpm]
 ruby-dev [test platform:dpkg]
 zlib1g-dev [test platform:dpkg]
 zlib-devel [test platform:rpm]
+puppet [build]
diff --git a/moduleroot/spec/acceptance/nodesets/nodepool-bionic.yml b/moduleroot/spec/acceptance/nodesets/nodepool-bionic.yml
new file mode 100644
index 0000000..ad73cc5
--- /dev/null
+++ b/moduleroot/spec/acceptance/nodesets/nodepool-bionic.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-18.04-amd64:
+    roles:
+      - master
+    platform: ubuntu-18.04-amd64
+    hypervisor: none
+    ip: 127.0.0.1
+CONFIG:
+  type: foss
+  set_env: false
diff --git a/moduleroot/test-requirements.txt b/moduleroot/test-requirements.txt
deleted file mode 100644
index 230fd78..0000000
--- a/moduleroot/test-requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is required for the docs build jobs
-sphinx # BSD
-openstackdocstheme # Apache-2.0
-
-# This is required for the releasenotes build jobs
-reno
diff --git a/moduleroot/tox.ini b/moduleroot/tox.ini
index cd122cb..cb4ba51 100644
--- a/moduleroot/tox.ini
+++ b/moduleroot/tox.ini
@@ -7,5 +7,6 @@ envlist = releasenotes
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 
 [testenv:releasenotes]
-deps = -rtest-requirements.txt
+basepython = python3
+deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html