diff --git a/octavia/api/v2/controllers/listener.py b/octavia/api/v2/controllers/listener.py
index 8e52bf3695..19b620ec94 100644
--- a/octavia/api/v2/controllers/listener.py
+++ b/octavia/api/v2/controllers/listener.py
@@ -371,9 +371,9 @@ class ListenersController(base.BaseController):
 
         # Make sure we have a client CA cert if they enable client auth
         if ((listener.client_authentication != wtypes.Unset and
-             listener.client_authentication != constants.CLIENT_AUTH_NONE)
-            and not (db_listener.client_ca_tls_certificate_id or
-                     listener.client_ca_tls_container_ref)):
+             listener.client_authentication != constants.CLIENT_AUTH_NONE) and
+            not (db_listener.client_ca_tls_certificate_id or
+                 listener.client_ca_tls_container_ref)):
             raise exceptions.ValidationException(detail=_(
                 "Client authentication setting %s requires a client CA "
                 "container reference.") %
diff --git a/octavia/tests/unit/certificates/generator/test_local.py b/octavia/tests/unit/certificates/generator/test_local.py
index 16afc6a543..dd73e4f800 100644
--- a/octavia/tests/unit/certificates/generator/test_local.py
+++ b/octavia/tests/unit/certificates/generator/test_local.py
@@ -81,7 +81,7 @@ class TestLocalGenerator(local_csr.BaseLocalCSRTestCase):
         should_expire = (datetime.datetime.utcnow() +
                          datetime.timedelta(seconds=2 * 365 * 24 * 60 * 60))
         diff = should_expire - cert.not_valid_after
-        self.assertTrue(diff < datetime.timedelta(seconds=10))
+        self.assertLess(diff, datetime.timedelta(seconds=10))
 
         # Make sure this is a version 3 X509.
         self.assertEqual('v3', cert.version.name)
@@ -126,7 +126,7 @@ class TestLocalGenerator(local_csr.BaseLocalCSRTestCase):
         should_expire = (datetime.datetime.utcnow() +
                          datetime.timedelta(seconds=2 * 365 * 24 * 60 * 60))
         diff = should_expire - cert.not_valid_after
-        self.assertTrue(diff < datetime.timedelta(seconds=10))
+        self.assertLess(diff, datetime.timedelta(seconds=10))
 
         # Make sure this is a version 3 X509.
         self.assertEqual('v3', cert.version.name)
diff --git a/octavia/tests/unit/test_hacking.py b/octavia/tests/unit/test_hacking.py
index 31c682de83..48d8bb88ee 100644
--- a/octavia/tests/unit/test_hacking.py
+++ b/octavia/tests/unit/test_hacking.py
@@ -71,7 +71,7 @@ class HackingTestCase(base.BaseTestCase):
         return check_fns
 
     def test_factory(self):
-        self.assertTrue(len(self._get_factory_checks(checks.factory)) > 0)
+        self.assertGreater(len(self._get_factory_checks(checks.factory)), 0)
 
     def test_assert_true_instance(self):
         self.assertEqual(1, len(list(checks.assert_true_instance(