diff --git a/bot/reviewbot/tests/test_celery.py b/bot/reviewbot/tests/test_celery.py
index 10594ced8e082a48a3409f722270caf2d866da8c..74f3fbab4bece1865dcc9004c42392447775b012 100644
--- a/bot/reviewbot/tests/test_celery.py
+++ b/bot/reviewbot/tests/test_celery.py
@@ -77,7 +77,7 @@ class SetupCookiesTests(kgb.SpyAgency, TestCase):
                 'Unable to create cookies directory "/dev/null/cookies/":'
             )
 
-            with self.assertRaisesRegexp(IOError, expected_message):
+            with self.assertRaisesRegex(IOError, expected_message):
                 setup_cookies()
 
         self.assertSpyCalledWith(
@@ -107,7 +107,7 @@ class SetupCookiesTests(kgb.SpyAgency, TestCase):
                 % cookie_path
             )
 
-            with self.assertRaisesRegexp(IOError, expected_message):
+            with self.assertRaisesRegex(IOError, expected_message):
                 setup_cookies()
 
         self.assertSpyCalledWith(
@@ -134,7 +134,7 @@ class SetupCookiesTests(kgb.SpyAgency, TestCase):
                 % cookie_path
             )
 
-            with self.assertRaisesRegexp(IOError, expected_message):
+            with self.assertRaisesRegex(IOError, expected_message):
                 setup_cookies()
 
         self.assertSpyCalledWith(
diff --git a/bot/reviewbot/tools/tests/test_registry.py b/bot/reviewbot/tools/tests/test_registry.py
index 5c835d93ed92d0977db450dbbcf35fb0fc381876..73f4b6af27c762d8c5ff95fd42eb6a1b624c85d9 100644
--- a/bot/reviewbot/tools/tests/test_registry.py
+++ b/bot/reviewbot/tools/tests/test_registry.py
@@ -52,7 +52,7 @@ class RegistryTestCase(TestCase):
             % DummyTool
         )
 
-        with self.assertRaisesRegexp(ValueError, expected_message):
+        with self.assertRaisesRegex(ValueError, expected_message):
             register_tool_class(DummyTool)
 
         self.assertEqual(_registered_tools, {})
@@ -72,7 +72,7 @@ class RegistryTestCase(TestCase):
             % DummyTool
         )
 
-        with self.assertRaisesRegexp(ValueError, expected_message):
+        with self.assertRaisesRegex(ValueError, expected_message):
             register_tool_class(DummyTool2)
 
         self.assertEqual(
@@ -97,7 +97,7 @@ class RegistryTestCase(TestCase):
             'A tool with the ID "dummy" was not registered.'
         )
 
-        with self.assertRaisesRegexp(KeyError, expected_message):
+        with self.assertRaisesRegex(KeyError, expected_message):
             unregister_tool_class('dummy')
 
         self.assertEqual(_registered_tools, {})