diff --git a/openstackclient/tests/unit/integ/cli/test_shell.py b/openstackclient/tests/unit/integ/cli/test_shell.py
index 9d819ed2e4..4e91f6370e 100644
--- a/openstackclient/tests/unit/integ/cli/test_shell.py
+++ b/openstackclient/tests/unit/integ/cli/test_shell.py
@@ -397,14 +397,14 @@ class TestIntegShellCliPrecedenceOCC(test_base.TestInteg):
         Run 1 has --os-password on CLI
         """
 
-        config_mock.return_value = (
-            'file.yaml',
-            copy.deepcopy(test_shell.CLOUD_2),
-        )
-        vendor_mock.return_value = (
-            'file.yaml',
-            copy.deepcopy(test_shell.PUBLIC_1),
-        )
+        def config_mock_return():
+            return ('file.yaml', copy.deepcopy(test_shell.CLOUD_2))
+        config_mock.side_effect = config_mock_return
+
+        def vendor_mock_return():
+            return ('file.yaml', copy.deepcopy(test_shell.PUBLIC_1))
+        vendor_mock.side_effect = vendor_mock_return
+
         _shell = shell.OpenStackShell()
         _shell.run(
             "--os-password qaz configuration show".split(),
@@ -466,14 +466,14 @@ class TestIntegShellCliPrecedenceOCC(test_base.TestInteg):
         Run 2 has --os-username, --os-password, --os-project-domain-id on CLI
         """
 
-        config_mock.return_value = (
-            'file.yaml',
-            copy.deepcopy(test_shell.CLOUD_2),
-        )
-        vendor_mock.return_value = (
-            'file.yaml',
-            copy.deepcopy(test_shell.PUBLIC_1),
-        )
+        def config_mock_return():
+            return ('file.yaml', copy.deepcopy(test_shell.CLOUD_2))
+        config_mock.side_effect = config_mock_return
+
+        def vendor_mock_return():
+            return ('file.yaml', copy.deepcopy(test_shell.PUBLIC_1))
+        vendor_mock.side_effect = vendor_mock_return
+
         _shell = shell.OpenStackShell()
         _shell.run(
             "--os-username zarquon --os-password qaz "
diff --git a/openstackclient/tests/unit/volume/test_find_resource.py b/openstackclient/tests/unit/volume/test_find_resource.py
index d25093158c..dbf9592f33 100644
--- a/openstackclient/tests/unit/volume/test_find_resource.py
+++ b/openstackclient/tests/unit/volume/test_find_resource.py
@@ -45,7 +45,6 @@ class TestFindResourceVolumes(test_utils.TestCase):
         resp = mock.Mock()
         body = {"volumes": [{"id": ID, 'display_name': NAME}]}
         api.client.get.side_effect = [Exception("Not found"),
-                                      Exception("Not found"),
                                       (resp, body)]
         self.manager = volumes.VolumeManager(api)
 
@@ -69,7 +68,6 @@ class TestFindResourceVolumeSnapshots(test_utils.TestCase):
         resp = mock.Mock()
         body = {"snapshots": [{"id": ID, 'display_name': NAME}]}
         api.client.get.side_effect = [Exception("Not found"),
-                                      Exception("Not found"),
                                       (resp, body)]
         self.manager = volume_snapshots.SnapshotManager(api)