diff --git a/setup.py b/setup.py
index 07f55fe..31d6ada 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,21 @@
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# 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.
+
 import setuptools
 
-setuptools.setup(setup_requires=['pbr'], pbr=True)
+setuptools.setup(
+    setup_requires=['pbr>=2.0.0'],
+    py_modules=[],
+    pbr=True)
diff --git a/tox.ini b/tox.ini
index ca4b257..2695e7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
 envlist = py3
+minversion = 3.18.0
 
 [testenv]
-deps = {env:BASHATE_INSTALL_PATH:bashate==0.5.1}
+deps = {env:BASHATE_INSTALL_PATH:bashate>=0.5.1}
 
 [testenv:bashate]
-whitelist_externals = bash
+allowlist_externals = bash
 commands = bash -c "(find {toxinidir} \
                     -not \( -type d -name .?\* -prune \) \
                     -not \( -type d -name output-\* -prune \) \