diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_limits.py b/nova/tests/api/openstack/compute/plugins/v3/test_limits.py
index e9e3f78c9d3b..c07fdde218af 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_limits.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_limits.py
@@ -546,7 +546,7 @@ class LimiterTest(BaseLimitTestSuite):
 
         expected = 60.0 / 7.0
         results = self._check_sum(1, "POST", "/anything")
-        self.failUnlessAlmostEqual(expected, results, 8)
+        self.assertAlmostEqual(expected, results, 8)
 
     def test_delay_GET(self):
         # Ensure the 11th GET will result in NO delay.
diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py
index a61374d1787a..78289127c9dd 100644
--- a/nova/tests/api/openstack/compute/test_limits.py
+++ b/nova/tests/api/openstack/compute/test_limits.py
@@ -551,7 +551,7 @@ class LimiterTest(BaseLimitTestSuite):
 
         expected = 60.0 / 7.0
         results = self._check_sum(1, "POST", "/anything")
-        self.failUnlessAlmostEqual(expected, results, 8)
+        self.assertAlmostEqual(expected, results, 8)
 
     def test_delay_GET(self):
         # Ensure the 11th GET will result in NO delay.
diff --git a/smoketests/public_network_smoketests.py b/smoketests/public_network_smoketests.py
index 9b68a8fc7e88..ef6582770438 100644
--- a/smoketests/public_network_smoketests.py
+++ b/smoketests/public_network_smoketests.py
@@ -82,11 +82,11 @@ class InstanceTestsFromPublic(base.UserSmokeTestCase):
         else:
             self.fail('instance failed to start')
         ip = reservations[0].instances[0].private_ip_address
-        self.failIf(ip == '0.0.0.0')
+        self.assertFalse(ip == '0.0.0.0')
         self.data['private_ip'] = ip
         if FLAGS.use_ipv6:
             ipv6 = reservations[0].instances[0].dns_name_v6
-            self.failIf(ipv6 is None)
+            self.assertFalse(ipv6 is None)
             self.data['ip_v6'] = ipv6
 
     def test_004_can_ssh_to_ipv6(self):
@@ -124,11 +124,11 @@ class InstanceTestsFromPublic(base.UserSmokeTestCase):
         else:
             self.fail('instance failed to start')
         ip = reservations[0].instances[0].private_ip_address
-        self.failIf(ip == '0.0.0.0')
+        self.assertFalse(ip == '0.0.0.0')
         self.data['private_ip'] = ip
         if FLAGS.use_ipv6:
             ipv6 = reservations[0].instances[0].dns_name_v6
-            self.failIf(ipv6 is None)
+            self.assertFalse(ipv6 is None)
             self.data['ip_v6'] = ipv6
 
     def test_014_can_not_ping_private_ip(self):
diff --git a/smoketests/test_sysadmin.py b/smoketests/test_sysadmin.py
index d45a75b744f3..58d2a6d53202 100644
--- a/smoketests/test_sysadmin.py
+++ b/smoketests/test_sysadmin.py
@@ -166,10 +166,10 @@ class InstanceTests(base.UserSmokeTestCase):
             self.fail('instance failed to start')
         self.data['instance'].update()
         ip = self.data['instance'].private_ip_address
-        self.failIf(ip == '0.0.0.0')
+        self.assertFalse(ip == '0.0.0.0')
         if FLAGS.use_ipv6:
             ipv6 = self.data['instance'].dns_name_v6
-            self.failIf(ipv6 is None)
+            self.assertFalse(ipv6 is None)
 
     def test_004_can_ping_private_ip(self):
         if not self.wait_for_ping(self.data['instance'].private_ip_address):