diff --git a/keystoneclient/baseclient.py b/keystoneclient/baseclient.py
index 97943684d..ca39f6d14 100644
--- a/keystoneclient/baseclient.py
+++ b/keystoneclient/baseclient.py
@@ -10,10 +10,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import warnings
+
 
 class Client(object):
 
     def __init__(self, session):
+        warnings.warn(
+            'keystoneclient.baseclient.Client is deprecated as of the 2.1.0 '
+            'release. It will be removed in future releases.',
+            DeprecationWarning)
+
         self.session = session
 
     def request(self, url, method, **kwargs):
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index cb910b6ef..44fda67fa 100644
--- a/keystoneclient/httpclient.py
+++ b/keystoneclient/httpclient.py
@@ -379,7 +379,7 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin):
             session = client_session.Session._construct(kwargs)
             session.auth = self
 
-        super(HTTPClient, self).__init__(session=session)
+        self.session = session
         self.domain = ''
         self.debug_log = debug