diff --git a/functional/tests/identity/v3/test_identity.py b/functional/tests/identity/v3/test_identity.py
index c72dc9a0..cf434559 100644
--- a/functional/tests/identity/v3/test_identity.py
+++ b/functional/tests/identity/v3/test_identity.py
@@ -42,8 +42,7 @@ class IdentityTests(test.TestCase):
         auth_url = auth_url.replace('v2.0', 'v3')
         os.environ['OS_AUTH_URL'] = auth_url
         os.environ['OS_IDENTITY_API_VERSION'] = '3'
-        os.environ['OS_USER_DOMAIN_ID'] = 'default'
-        os.environ['OS_PROJECT_DOMAIN_ID'] = 'default'
+        os.environ['OS_AUTH_TYPE'] = 'v3password'
 
         # create dummy domain
         cls.domain_name = data_utils.rand_name('TestDomain')
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index a8a1936d..c80b0084 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -250,7 +250,7 @@ class TestServerCreate(TestServer):
         mock_open.assert_called_with('userdata.sh')
 
         # Ensure the userdata file is closed
-        mock_file.close.assert_called()
+        mock_file.close.assert_called_with()
 
         # Set expected values
         kwargs = dict(
diff --git a/openstackclient/tests/volume/v1/test_qos_specs.py b/openstackclient/tests/volume/v1/test_qos_specs.py
index 0a5d14e6..226fe673 100644
--- a/openstackclient/tests/volume/v1/test_qos_specs.py
+++ b/openstackclient/tests/volume/v1/test_qos_specs.py
@@ -312,7 +312,7 @@ class TestQosList(TestQos):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.qos_mock.list.assert_called()
+        self.qos_mock.list.assert_called_with()
 
         collist = (
             'ID',
diff --git a/openstackclient/tests/volume/v2/test_qos_specs.py b/openstackclient/tests/volume/v2/test_qos_specs.py
index 92b3f179..6a550988 100644
--- a/openstackclient/tests/volume/v2/test_qos_specs.py
+++ b/openstackclient/tests/volume/v2/test_qos_specs.py
@@ -312,7 +312,7 @@ class TestQosList(TestQos):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.qos_mock.list.assert_called()
+        self.qos_mock.list.assert_called_with()
 
         collist = (
             'ID',
diff --git a/test-requirements.txt b/test-requirements.txt
index 950ae373..cf92f702 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.0;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.5.1 # Apache-2.0
 requests-mock>=0.6.0 # Apache-2.0