diff --git a/pywbem_mock/__init__.py b/pywbem_mock/__init__.py
index 57085d5c7..e9596885f 100644
--- a/pywbem_mock/__init__.py
+++ b/pywbem_mock/__init__.py
@@ -23,6 +23,13 @@
 
 from __future__ import absolute_import
 
+# The config namespace is imported as a sub-namespace to make the config
+# variables accessible directly via their defining namespace. Importing
+# them into the pywbem_mock namespace would duplicate their names and thus
+# would cause changes to the config variables not to be visible in their
+# original namespace.
+from . import config  # noqa: F401
+
 from ._wbemconnection_mock import *        # noqa: F403,F401
 from ._dmtf_cim_schema import *            # noqa: F403,F401
 from ._resolvermixin import *              # noqa: F403,F401
@@ -38,5 +45,4 @@
 from ._methodprovider import *             # noqa: F403,F401
 from ._namespaceprovider import *          # noqa: F403,F401
 from ._subscriptionproviders import *      # noqa: F403,F401
-
 from ._utils import *                      # noqa: F403,F401
diff --git a/pywbem_mock/_baseprovider.py b/pywbem_mock/_baseprovider.py
index 391144288..c876bd93f 100644
--- a/pywbem_mock/_baseprovider.py
+++ b/pywbem_mock/_baseprovider.py
@@ -46,6 +46,8 @@
 # pywbem_mock implementation configuration variables that are used in
 # request responsders.
 
+__all__ = ['BaseProvider']
+
 
 class BaseProvider(object):
     """
diff --git a/pywbem_mock/_baserepository.py b/pywbem_mock/_baserepository.py
index 2edf05335..825089dc4 100644
--- a/pywbem_mock/_baserepository.py
+++ b/pywbem_mock/_baserepository.py
@@ -48,6 +48,8 @@
 from abc import abstractmethod, abstractproperty
 from six import PY2
 
+__all__ = ['BaseObjectStore', 'BaseRepository']
+
 
 def compatibleabstractproperty(func):
     """
diff --git a/pywbem_mock/_mainprovider.py b/pywbem_mock/_mainprovider.py
index c9450f1e7..03632035d 100644
--- a/pywbem_mock/_mainprovider.py
+++ b/pywbem_mock/_mainprovider.py
@@ -73,6 +73,7 @@
 # The following config items only apply to open/pull operations
 from .config import DEFAULT_MAX_OBJECT_COUNT, OPEN_MAX_TIMEOUT
 
+__all__ = ['MainProvider']
 
 # per DSP0200, the default behavior for EnumerateInstance DeepInheritance
 # if not set by in the client request.  Default is True so that the mock server
diff --git a/pywbem_mock/_mockmofwbemconnection.py b/pywbem_mock/_mockmofwbemconnection.py
index fc4519642..6e0309e0e 100644
--- a/pywbem_mock/_mockmofwbemconnection.py
+++ b/pywbem_mock/_mockmofwbemconnection.py
@@ -34,6 +34,8 @@
 from pywbem._utils import _format
 from ._resolvermixin import ResolverMixin
 
+__all__ = []
+
 
 class _MockMOFWBEMConnection(ResolverMixin, BaseRepositoryConnection):
     """
diff --git a/pywbem_mock/_namespaceprovider.py b/pywbem_mock/_namespaceprovider.py
index 38c1a5172..d68bb19dd 100644
--- a/pywbem_mock/_namespaceprovider.py
+++ b/pywbem_mock/_namespaceprovider.py
@@ -40,7 +40,6 @@
 from .config import OBJECTMANAGERNAME, SYSTEMNAME, SYSTEMCREATIONCLASSNAME, \
     OBJECTMANAGERCREATIONCLASSNAME
 
-
 __all__ = ['CIMNamespaceProvider']
 
 # CIM class name of the namespace class implemented in this provider
diff --git a/pywbem_mock/_providerdispatcher.py b/pywbem_mock/_providerdispatcher.py
index 0694bf48e..f36ab25fd 100644
--- a/pywbem_mock/_providerdispatcher.py
+++ b/pywbem_mock/_providerdispatcher.py
@@ -52,6 +52,8 @@
 from ._instancewriteprovider import InstanceWriteProvider
 from ._methodprovider import MethodProvider
 
+__all__ = ['ProviderDispatcher']
+
 
 class ProviderDispatcher(BaseProvider):
     """
diff --git a/pywbem_mock/_resolvermixin.py b/pywbem_mock/_resolvermixin.py
index fb874c6f0..a2ccd9b6c 100644
--- a/pywbem_mock/_resolvermixin.py
+++ b/pywbem_mock/_resolvermixin.py
@@ -45,6 +45,8 @@
 
 from pywbem._utils import _format
 
+__all__ = []
+
 
 class ResolverMixin(object):  # pylint: disable=too-few-public-methods
     """
diff --git a/pywbem_mock/_subscriptionproviders.py b/pywbem_mock/_subscriptionproviders.py
index aa1501884..767f1f93b 100644
--- a/pywbem_mock/_subscriptionproviders.py
+++ b/pywbem_mock/_subscriptionproviders.py
@@ -52,6 +52,9 @@
 from ._instancewriteprovider import InstanceWriteProvider
 from .config import SYSTEMNAME, SYSTEMCREATIONCLASSNAME
 
+__all__ = ['CIMIndicationFilterProvider', 'CIMListenerDestinationProvider',
+           'CIMIndicationSubscriptionProvider']
+
 # CIM class name of the classes implemented in these providers
 SUBSCRIPTION_CLASSNAME = 'CIM_IndicationSubscription'
 FILTER_CLASSNAME = 'CIM_IndicationFilter'
diff --git a/pywbem_mock/_utils.py b/pywbem_mock/_utils.py
index cb0d159d0..0e5bd95b2 100644
--- a/pywbem_mock/_utils.py
+++ b/pywbem_mock/_utils.py
@@ -30,6 +30,8 @@
 
 import six
 
+__all__ = []
+
 STDOUT_ENCODING = getattr(sys.stdout, 'encoding', None)
 if not STDOUT_ENCODING:
     STDOUT_ENCODING = locale.getpreferredencoding()
diff --git a/pywbem_mock/_wbemconnection_mock.py b/pywbem_mock/_wbemconnection_mock.py
index 2a6fe144b..86e7bd7ad 100644
--- a/pywbem_mock/_wbemconnection_mock.py
+++ b/pywbem_mock/_wbemconnection_mock.py
@@ -37,7 +37,6 @@
 #    from mock import Mock
 import six
 
-
 from pywbem import WBEMConnection, CIMClass, CIMClassName, \
     CIMInstance, CIMInstanceName, CIMParameter, CIMQualifierDeclaration, \
     cimtype, CIMError, CIM_ERR_FAILED, DEFAULT_NAMESPACE, MOFCompiler, \
diff --git a/tests/unittest/pywbem/test_subscriptionmanager.py b/tests/unittest/pywbem/test_subscriptionmanager.py
index 12f6bfd70..2b1702eef 100644
--- a/tests/unittest/pywbem/test_subscriptionmanager.py
+++ b/tests/unittest/pywbem/test_subscriptionmanager.py
@@ -39,7 +39,7 @@
     CIMInstance, CIMDateTime, CIMError, CIM_ERR_ALREADY_EXISTS  # noqa: E402
 from pywbem._subscription_manager import SUBSCRIPTION_CLASSNAME, \
     DESTINATION_CLASSNAME, FILTER_CLASSNAME  # noqa: E402
-from pywbem_mock import OBJECTMANAGERNAME, \
+from pywbem_mock.config import OBJECTMANAGERNAME, \
     SYSTEMNAME  # noqa: E402
 pywbem_mock = import_installed('pywbem_mock')
 # pylint: enable=wrong-import-position, wrong-import-order, invalid-name
diff --git a/tests/unittest/pywbem_mock/test_wbemconnection_mock.py b/tests/unittest/pywbem_mock/test_wbemconnection_mock.py
index 13fd6c2cf..96f454ecd 100644
--- a/tests/unittest/pywbem_mock/test_wbemconnection_mock.py
+++ b/tests/unittest/pywbem_mock/test_wbemconnection_mock.py
@@ -79,8 +79,9 @@
 
 pywbem_mock = import_installed('pywbem_mock')
 from pywbem_mock import FakedWBEMConnection, DMTFCIMSchema, \
-    InstanceWriteProvider, MethodProvider, BaseProvider, \
-    IGNORE_INSTANCE_IQ_PARAM, IGNORE_INSTANCE_ICO_PARAM  # noqa: E402
+    InstanceWriteProvider, MethodProvider, BaseProvider  # noqa: E402
+from pywbem_mock.config import IGNORE_INSTANCE_IQ_PARAM, \
+    IGNORE_INSTANCE_ICO_PARAM  # noqa: E402
 # pylint: enable=wrong-import-position, wrong-import-order, invalid-name
 
 
diff --git a/tests/unittest/utils/wbemserver_mock.py b/tests/unittest/utils/wbemserver_mock.py
index d8f90f436..c5484b18b 100644
--- a/tests/unittest/utils/wbemserver_mock.py
+++ b/tests/unittest/utils/wbemserver_mock.py
@@ -16,7 +16,7 @@
     CIMInstanceName  # noqa: E402
 pywbem_mock = import_installed('pywbem_mock')
 from pywbem_mock import FakedWBEMConnection  # noqa: E402
-from pywbem_mock import OBJECTMANAGERCREATIONCLASSNAME, \
+from pywbem_mock.config import OBJECTMANAGERCREATIONCLASSNAME, \
     SYSTEMCREATIONCLASSNAME, OBJECTMANAGERNAME, \
     SYSTEMNAME  # noqa: E402
 # pylint: enable=wrong-import-position, wrong-import-order, invalid-name