diff --git a/plugins/modules/os_networks_info.py b/plugins/modules/os_networks_info.py
index 0326a63c..d5efe9f5 100644
--- a/plugins/modules/os_networks_info.py
+++ b/plugins/modules/os_networks_info.py
@@ -125,9 +125,10 @@ openstack_networks:
 '''
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_full_argument_spec,
+    openstack_cloud_from_module,
+)
 
 
 def main():
diff --git a/plugins/modules/os_quota.py b/plugins/modules/os_quota.py
index f72d2f30..d469e7b7 100644
--- a/plugins/modules/os_quota.py
+++ b/plugins/modules/os_quota.py
@@ -236,9 +236,10 @@ except ImportError:
     HAS_KEYSTONEAUTH1 = False
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_full_argument_spec,
+    openstack_cloud_from_module,
+)
 
 
 def _get_volume_quotas(cloud, project):
diff --git a/plugins/modules/os_user.py b/plugins/modules/os_user.py
index 9b4204c8..32dcde65 100644
--- a/plugins/modules/os_user.py
+++ b/plugins/modules/os_user.py
@@ -135,8 +135,6 @@ user:
             type: str
             sample: "demouser"
 '''
-from distutils.version import StrictVersion
-
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
                                                                                 openstack_module_kwargs,
diff --git a/plugins/modules/os_user_info.py b/plugins/modules/os_user_info.py
index e77b71bc..f055516a 100644
--- a/plugins/modules/os_user_info.py
+++ b/plugins/modules/os_user_info.py
@@ -118,9 +118,10 @@ openstack_users:
 '''
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_full_argument_spec,
+    openstack_cloud_from_module,
+)
 
 
 def main():
diff --git a/plugins/modules/os_volume.py b/plugins/modules/os_volume.py
index 64f842e4..3dbc402b 100644
--- a/plugins/modules/os_volume.py
+++ b/plugins/modules/os_volume.py
@@ -99,9 +99,6 @@ volume:
   type: dict
   sample: {'...'}
 '''
-from distutils.version import StrictVersion
-
-
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
                                                                                 openstack_module_kwargs,
diff --git a/tests/unit/compat/builtins.py b/tests/unit/compat/builtins.py
index f60ee678..2084b253 100644
--- a/tests/unit/compat/builtins.py
+++ b/tests/unit/compat/builtins.py
@@ -26,7 +26,7 @@ __metaclass__ = type
 # One unittest needs to import builtins via __import__() so we need to have
 # the string that represents it
 try:
-    import __builtin__
+    import __builtin__  # noqa
 except ImportError:
     BUILTINS = 'builtins'
 else:
diff --git a/tox.ini b/tox.ini
index 921719c1..41e0ab9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,9 +49,9 @@ commands = {posargs}
 #      Also, both openstacksdk and Donald Knuth disagree with the rule. Line
 #      breaks should occur before the binary operator for readability.
 # H4 are rules for docstrings. Maybe we should clean them?
-# E501,E402,H301,H236,F401 are ignored so we can import the existing
+# E501,E402,H301,H236 are ignored so we can import the existing
 #      modules unchanged and then clean them in subsequent patches.
-ignore = W503,H4,E501,E402,H301,H236,F401
+ignore = W503,H4,E501,E402,H301,H236
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_collections