diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py
index a6360d878..cc6badc6c 100644
--- a/keystoneclient/middleware/auth_token.py
+++ b/keystoneclient/middleware/auth_token.py
@@ -503,7 +503,7 @@ class AuthProtocol(object):
         cache = self._conf_get('cache')
         memcache_servers = self._conf_get('memcached_servers')
 
-        if cache and env.get(cache, None) is not None:
+        if cache and env.get(cache) is not None:
             # use the cache from the upstream filter
             self.LOG.info('Using %s memcache for caching token', cache)
             self._cache = env.get(cache)
diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py
index 682880284..401ff0473 100644
--- a/keystoneclient/shell.py
+++ b/keystoneclient/shell.py
@@ -64,7 +64,7 @@ def env(*vars, **kwargs):
 
     """
     for v in vars:
-        value = os.environ.get(v, None)
+        value = os.environ.get(v)
         if value:
             return value
     return kwargs.get('default', '')
diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py
index 2329b18eb..39bc0ffe0 100644
--- a/keystoneclient/tests/test_auth_token_middleware.py
+++ b/keystoneclient/tests/test_auth_token_middleware.py
@@ -158,7 +158,7 @@ class TimezoneFixture(fixtures.Fixture):
     def __init__(self, new_tz):
         super(TimezoneFixture, self).__init__()
         self.tz = new_tz
-        self.old_tz = os.environ.get('TZ', None)
+        self.old_tz = os.environ.get('TZ')
 
     def setUp(self):
         super(TimezoneFixture, self).setUp()
diff --git a/keystoneclient/tests/utils.py b/keystoneclient/tests/utils.py
index 3256dd398..d97339967 100644
--- a/keystoneclient/tests/utils.py
+++ b/keystoneclient/tests/utils.py
@@ -134,7 +134,7 @@ class TestResponse(requests.Response):
                 self.headers.update(headers)
             # Fake the text attribute to streamline Response creation
             # _content is defined by requests.Response
-            self._content = data.get('text', None)
+            self._content = data.get('text')
         else:
             self.status_code = data
 
diff --git a/keystoneclient/tests/v2_0/fakes.py b/keystoneclient/tests/v2_0/fakes.py
index c8de53900..214ea714b 100644
--- a/keystoneclient/tests/v2_0/fakes.py
+++ b/keystoneclient/tests/v2_0/fakes.py
@@ -48,7 +48,7 @@ class FakeHTTPClient(fakes.FakeClient):
                                  (method, url, callback))
 
         # Note the call
-        self.callstack.append((method, url, kwargs.get('body', None)))
+        self.callstack.append((method, url, kwargs.get('body')))
 
         if not hasattr(self, callback):
             raise AssertionError('Called unknown API method: %s %s, '
@@ -56,7 +56,7 @@ class FakeHTTPClient(fakes.FakeClient):
                                  (method, url, callback))
 
         # Note the call
-        self.callstack.append((method, url, kwargs.get('body', None)))
+        self.callstack.append((method, url, kwargs.get('body')))
 
         status, body = getattr(self, callback)(**kwargs)
         r = utils.TestResponse({
diff --git a/keystoneclient/v2_0/tokens.py b/keystoneclient/v2_0/tokens.py
index da780606d..d6f3462eb 100644
--- a/keystoneclient/v2_0/tokens.py
+++ b/keystoneclient/v2_0/tokens.py
@@ -27,7 +27,7 @@ class Token(base.Resource):
 
     @property
     def tenant(self):
-        return self._info['token'].get('tenant', None)
+        return self._info['token'].get('tenant')
 
 
 class TokenManager(base.Manager):