diff --git a/keystoneclient/__init__.py b/keystoneclient/__init__.py
index ab4f7a1ce..bd50f9f6d 100644
--- a/keystoneclient/__init__.py
+++ b/keystoneclient/__init__.py
@@ -15,6 +15,15 @@
 
 import pbr.version
 
+from keystoneclient import access
+from keystoneclient import client
+from keystoneclient import exceptions
+from keystoneclient import generic
+from keystoneclient import httpclient
+from keystoneclient import service_catalog
+from keystoneclient import v2_0
+from keystoneclient import v3
+
 
 __version__ = pbr.version.VersionInfo('python-keystoneclient').version_string()
 
diff --git a/keystoneclient/apiclient/__init__.py b/keystoneclient/apiclient/__init__.py
index 6c594f40b..344b66169 100644
--- a/keystoneclient/apiclient/__init__.py
+++ b/keystoneclient/apiclient/__init__.py
@@ -15,6 +15,8 @@
 
 import warnings
 
+from keystoneclient import exceptions
+
 # NOTE(akurilin): Module 'keystoneclient.apiclient' contains only exceptions
 # which are deprecated, so this module must also be deprecated which helps
 # to report 'deprecated' status of exceptions for next kind of imports