diff --git a/rsd_lib/tests/unit/resources/v2_3/fabric/test_endpoint.py b/rsd_lib/tests/unit/resources/v2_3/fabric/test_endpoint.py
index 360726d..b585646 100644
--- a/rsd_lib/tests/unit/resources/v2_3/fabric/test_endpoint.py
+++ b/rsd_lib/tests/unit/resources/v2_3/fabric/test_endpoint.py
@@ -164,7 +164,7 @@ class EndpointTestCase(testtools.TestCase):
             })
 
     def test_update_authentication_with_invalid_parameter(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             ValueError,
             'At least "username" or "password" parameter has to be specified'):
             self.endpoint_inst.update_authentication()
diff --git a/rsd_lib/tests/unit/resources/v2_3/storage_service/test_volume.py b/rsd_lib/tests/unit/resources/v2_3/storage_service/test_volume.py
index 809beb0..9f904ee 100644
--- a/rsd_lib/tests/unit/resources/v2_3/storage_service/test_volume.py
+++ b/rsd_lib/tests/unit/resources/v2_3/storage_service/test_volume.py
@@ -112,17 +112,17 @@ class StorageServiceTestCase(testtools.TestCase):
                                               "Erased": True}}})
 
     def test_update_volume_with_invalid_parameter(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             ValueError,
             'At least "bootable" or "erased" parameter has to be specified'):
             self.volume_inst.update()
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             exceptions.InvalidParameterValueError,
             'The parameter "bootable" value "fake-value" is invalid'):
             self.volume_inst.update(bootable='fake-value')
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             exceptions.InvalidParameterValueError,
             'The parameter "erased" value "fake-value" is invalid'):
             self.volume_inst.update(bootable=True, erased='fake-value')
@@ -148,7 +148,7 @@ class StorageServiceTestCase(testtools.TestCase):
             data={"InitializeType": "Slow"})
 
     def test_initialize_with_invalid_parameter(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             exceptions.InvalidParameterValueError,
             'The parameter "init_type" value "fake-value" is invalid'
                 '.*[\'Fast\', \'Slow\']'):