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/spec_helper.rb b/spec/spec_helper.rb
index 0b5e7777..cad00b19 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,20 +1,3 @@
-#
-# Copyright (C) 2016 Red Hat Inc. <licensing@redhat.com>
-#
-# Author: Ade Lee <alee@redhat.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'shared_examples'
 require 'puppet-openstack_spec_helper/facts'
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 99b536c4..9196bc99 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,18 +1 @@
-#
-# Copyright (C) 2016 Red Hat Inc. <licensing@redhat.com>
-#
-# Author: Ade Lee <alee@redhat.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
 require 'puppet-openstack_spec_helper/beaker_spec_helper'