diff --git a/lib/ansible/module_utils/docker_common.py b/lib/ansible/module_utils/docker_common.py
index ca46823ff9..2608fcd6e3 100644
--- a/lib/ansible/module_utils/docker_common.py
+++ b/lib/ansible/module_utils/docker_common.py
@@ -90,9 +90,6 @@ if not HAS_DOCKER_PY:
         def __init__(self, **kwargs):
             pass
 
-    class APIError:
-        def __init__(self, **kwargs):
-            pass
 
 class DockerBaseClass(object):
 
diff --git a/lib/ansible/modules/cloud/docker/docker_secret.py b/lib/ansible/modules/cloud/docker/docker_secret.py
index c45aa651c0..183ffd8524 100644
--- a/lib/ansible/modules/cloud/docker/docker_secret.py
+++ b/lib/ansible/modules/cloud/docker/docker_secret.py
@@ -145,8 +145,15 @@ secret_id:
 '''
 
 import hashlib
+
+try:
+    from docker.errors import APIError
+except ImportError:
+    # missing docker-py handled in ansible.module_utils.docker
+    pass
+
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.docker_common import AnsibleDockerClient, DockerBaseClass, APIError
+from ansible.module_utils.docker_common import AnsibleDockerClient, DockerBaseClass
 from ansible.module_utils._text import to_native, to_bytes
 
 
diff --git a/lib/ansible/modules/cloud/docker/docker_volume.py b/lib/ansible/modules/cloud/docker/docker_volume.py
index 96d804e9a7..2265fcfe7a 100644
--- a/lib/ansible/modules/cloud/docker/docker_volume.py
+++ b/lib/ansible/modules/cloud/docker/docker_volume.py
@@ -106,15 +106,15 @@ facts:
     sample: {}
 '''
 
-from ansible.module_utils.six import iteritems, text_type
-from ansible.module_utils.docker_common import DockerBaseClass, AnsibleDockerClient
-
 try:
     from docker.errors import APIError
-except:
+except ImportError:
     # missing docker-py handled in ansible.module_utils.docker
     pass
 
+from ansible.module_utils.six import iteritems, text_type
+from ansible.module_utils.docker_common import DockerBaseClass, AnsibleDockerClient
+
 
 class TaskParameters(DockerBaseClass):
     def __init__(self, client):
diff --git a/test/sanity/import/skip.txt b/test/sanity/import/skip.txt
index 3cb419c2e0..309164decc 100644
--- a/test/sanity/import/skip.txt
+++ b/test/sanity/import/skip.txt
@@ -41,7 +41,6 @@ lib/ansible/modules/cloud/cloudstack/cs_vpn_gateway.py
 lib/ansible/modules/cloud/cloudstack/cs_zone.py
 lib/ansible/modules/cloud/cloudstack/cs_zone_facts.py
 lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py
-lib/ansible/modules/cloud/docker/docker_secret.py
 lib/ansible/modules/cloud/google/gc_storage.py
 lib/ansible/modules/cloud/google/gcdns_record.py
 lib/ansible/modules/cloud/google/gcdns_zone.py