diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py
index 17542919a..a1a1964d1 100644
--- a/cinderclient/tests/unit/test_shell.py
+++ b/cinderclient/tests/unit/test_shell.py
@@ -167,7 +167,7 @@ class ShellTest(utils.TestCase):
         token_url = _shell.cs.client.auth_url + "/tokens"
         self.assertEqual(non_keystone_auth_url + "/tokens", token_url)
 
-        mock_request.assert_any_called(
+        mock_request.assert_any_call(
             "POST",
             token_url,
             headers=headers,
diff --git a/cinderclient/tests/unit/v1/test_auth.py b/cinderclient/tests/unit/v1/test_auth.py
index 5864b969e..7e5b90170 100644
--- a/cinderclient/tests/unit/v1/test_auth.py
+++ b/cinderclient/tests/unit/v1/test_auth.py
@@ -322,8 +322,8 @@ class AuthenticationTests(utils.TestCase):
         @mock.patch.object(http_client, 'authenticate')
         def test_auth_call(m):
             http_client.get('/')
-            m.assert_called()
-            mock_request.assert_called()
+            self.assertTrue(m.called)
+            self.assertTrue(mock_request.called)
 
         test_auth_call()
 
@@ -333,6 +333,6 @@ class AuthenticationTests(utils.TestCase):
         @mock.patch.object(cs.client, 'authenticate')
         def test_auth_call(m):
             cs.authenticate()
-            m.assert_called()
+            self.assertTrue(m.called)
 
         test_auth_call()
diff --git a/cinderclient/tests/unit/v2/test_auth.py b/cinderclient/tests/unit/v2/test_auth.py
index 9e9784696..4caf2eb1e 100644
--- a/cinderclient/tests/unit/v2/test_auth.py
+++ b/cinderclient/tests/unit/v2/test_auth.py
@@ -325,8 +325,8 @@ class AuthenticationTests(utils.TestCase):
         @mock.patch.object(http_client, 'authenticate')
         def test_auth_call(m):
             http_client.get('/')
-            m.assert_called()
-            mock_request.assert_called()
+            self.assertTrue(m.called)
+            self.assertTrue(mock_request.called)
 
         test_auth_call()
 
@@ -336,6 +336,6 @@ class AuthenticationTests(utils.TestCase):
         @mock.patch.object(cs.client, 'authenticate')
         def test_auth_call(m):
             cs.authenticate()
-            m.assert_called()
+            self.assertTrue(m.called)
 
         test_auth_call()
diff --git a/test-requirements.txt b/test-requirements.txt
index 4c920bbc4..c7c16b4cb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,8 @@ hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 fixtures>=1.3.1
-mock>=1.0
+mock>=1.1;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 oslosphinx>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18
 requests-mock>=0.6.0 # Apache-2.0