diff --git a/plugins/module_utils/openstack.py b/plugins/module_utils/openstack.py
index 9926af29..a11ebf91 100644
--- a/plugins/module_utils/openstack.py
+++ b/plugins/module_utils/openstack.py
@@ -28,6 +28,8 @@
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import abc
+from distutils.version import StrictVersion
+import importlib
 import os
 
 from ansible.module_utils.basic import AnsibleModule
@@ -112,10 +114,8 @@ def openstack_module_kwargs(**kwargs):
 
 
 def openstack_cloud_from_module(module, min_version='0.12.0'):
-    from distutils.version import StrictVersion
     try:
         # Due to the name shadowing we should import other way
-        import importlib
         sdk = importlib.import_module('openstack')
         sdk_version = importlib.import_module('openstack.version')
     except ImportError:
diff --git a/plugins/modules/os_keystone_mapping.py b/plugins/modules/os_keystone_mapping.py
index 5cdb40a3..6e9dd70e 100644
--- a/plugins/modules/os_keystone_mapping.py
+++ b/plugins/modules/os_keystone_mapping.py
@@ -12,7 +12,7 @@ DOCUMENTATION = '''
 module: os_keystone_mapping
 short_description: Manage a federation mapping
 author:
-  - "Mark Chappell <mchappel@redhat.com>"
+  - "Mark Chappell (@tremble) <mchappel@redhat.com>"
 description:
   - Manage a federation mapping.
 options:
diff --git a/tox.ini b/tox.ini
index 71ea9418..7bf7031d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,8 +37,8 @@ passenv = *
 commands =
     {[testenv:build]commands}
     {[testenv:pep8]commands}
-    /bin/bash -c "ansible-galaxy collection install $(ls {toxinidir}/build_artifact/openstack-cloud-*) --force -p {toxinidir}"
-    /bin/bash -c "cd ansible_collections/openstack/cloud && ansible-test sanity"
+    /bin/bash -c "ansible-galaxy collection install $(ls {toxinidir}/build_artifact/openstack-cloud-*) --force"
+    /bin/bash -c "cd ~/.ansible/collections/ansible_collections/openstack/cloud && ansible-test sanity --skip-test metaclass-boilerplate --skip-test future-import-boilerplate"
 
 [testenv:venv]
 deps =