diff --git a/bindep.txt b/bindep.txt
index 01b2ca6b..d6645f86 100644
--- a/bindep.txt
+++ b/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]
diff --git a/spec/acceptance/nodesets/nodepool-bionic.yml b/spec/acceptance/nodesets/nodepool-bionic.yml
new file mode 100644
index 00000000..ad73cc50
--- /dev/null
+++ b/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/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb
index c04729c4..12f1e2db 100644
--- a/spec/classes/tempest_init_spec.rb
+++ b/spec/classes/tempest_init_spec.rb
@@ -5,7 +5,7 @@ describe 'tempest' do
 
     let :pre_condition do
       "include ::glance
-       class { 'neutron': rabbit_password => 'passw0rd' }"
+       include ::neutron"
     end
 
     context 'without parameters' do
@@ -363,7 +363,7 @@ describe 'tempest' do
   shared_examples 'tempest with plugins packages' do
     let :pre_condition do
       "include ::glance
-       class { 'neutron': rabbit_password => 'passw0rd' }"
+       include ::neutron"
     end
 
     context 'with when managing tests packages for keystone (required service)' do