diff --git a/oslo_service/tests/test_eventlet_backdoor.py b/oslo_service/tests/test_eventlet_backdoor.py
index 7d632298..0d39284e 100644
--- a/oslo_service/tests/test_eventlet_backdoor.py
+++ b/oslo_service/tests/test_eventlet_backdoor.py
@@ -36,7 +36,7 @@ class BackdoorSocketPathTest(base.ServiceBaseTestCase):
         self.config(backdoor_socket="/tmp/my_special_socket")
         listen_mock.side_effect = mock.MagicMock()
         path = eventlet_backdoor.initialize_if_enabled(self.conf)
-        self.assertEqual(path, "/tmp/my_special_socket")
+        self.assertEqual("/tmp/my_special_socket", path)
 
     @mock.patch.object(os, 'unlink')
     @mock.patch.object(eventlet, 'spawn')
@@ -47,7 +47,7 @@ class BackdoorSocketPathTest(base.ServiceBaseTestCase):
         sock = mock.MagicMock()
         listen_mock.side_effect = [socket.error(errno.EADDRINUSE, ''), sock]
         path = eventlet_backdoor.initialize_if_enabled(self.conf)
-        self.assertEqual(path, "/tmp/my_special_socket")
+        self.assertEqual("/tmp/my_special_socket", path)
         unlink_mock.assert_called_with("/tmp/my_special_socket")
 
     @mock.patch.object(os, 'unlink')
@@ -60,7 +60,7 @@ class BackdoorSocketPathTest(base.ServiceBaseTestCase):
         listen_mock.side_effect = [socket.error(errno.EADDRINUSE, ''), sock]
         unlink_mock.side_effect = OSError(errno.ENOENT, '')
         path = eventlet_backdoor.initialize_if_enabled(self.conf)
-        self.assertEqual(path, "/tmp/my_special_socket")
+        self.assertEqual("/tmp/my_special_socket", path)
         unlink_mock.assert_called_with("/tmp/my_special_socket")
 
     @mock.patch.object(os, 'unlink')
@@ -95,7 +95,7 @@ class BackdoorPortTest(base.ServiceBaseTestCase):
         sock.getsockname.return_value = ('127.0.0.1', 1234)
         listen_mock.return_value = sock
         port = eventlet_backdoor.initialize_if_enabled(self.conf)
-        self.assertEqual(port, 1234)
+        self.assertEqual(1234, port)
 
     @mock.patch.object(eventlet, 'spawn')
     @mock.patch.object(eventlet, 'listen')
@@ -113,7 +113,7 @@ class BackdoorPortTest(base.ServiceBaseTestCase):
         sock.getsockname.return_value = ('127.0.0.1', 8800)
         listen_mock.return_value = sock
         port = eventlet_backdoor.initialize_if_enabled(self.conf)
-        self.assertEqual(port, 8800)
+        self.assertEqual(8800, port)
 
     @mock.patch.object(eventlet, 'spawn')
     @mock.patch.object(eventlet, 'listen')
@@ -123,7 +123,7 @@ class BackdoorPortTest(base.ServiceBaseTestCase):
         sock.getsockname.return_value = ('127.0.0.1', 8801)
         listen_mock.side_effect = [socket.error(errno.EADDRINUSE, ''), sock]
         port = eventlet_backdoor.initialize_if_enabled(self.conf)
-        self.assertEqual(port, 8801)
+        self.assertEqual(8801, port)
 
     @mock.patch.object(eventlet, 'spawn')
     @mock.patch.object(eventlet, 'listen')
diff --git a/oslo_service/tests/test_loopingcall.py b/oslo_service/tests/test_loopingcall.py
index 77df1c1c..c1495062 100644
--- a/oslo_service/tests/test_loopingcall.py
+++ b/oslo_service/tests/test_loopingcall.py
@@ -50,8 +50,8 @@ class LoopingCallTestCase(test_base.BaseTestCase):
         # Make sure that by default the oslo_service.service_hub() kicks in,
         # test in the main thread
         hub = eventlet.hubs.get_hub()
-        self.assertEqual(hub.clock,
-                         oslo_service._monotonic)
+        self.assertEqual(oslo_service._monotonic,
+                         hub.clock)
 
     def test_eventlet_use_hub_override(self):
         ns = {}
@@ -69,14 +69,14 @@ class LoopingCallTestCase(test_base.BaseTestCase):
         thread = threading.Thread(target=task)
         thread.start()
         thread.join()
-        self.assertEqual(ns['result'], 'ok')
+        self.assertEqual('ok', ns['result'])
 
     def _test_eventlet_use_hub_override(self):
         # Make sure that by default the
         # oslo_service.service_hub() kicks in
         old_clock = eventlet.hubs.get_hub().clock
-        self.assertEqual(old_clock,
-                         oslo_service._monotonic)
+        self.assertEqual(oslo_service._monotonic,
+                         old_clock)
 
         # eventlet will use time.monotonic() by default, same clock than
         # oslo.service_hub():
diff --git a/oslo_service/tests/test_periodic.py b/oslo_service/tests/test_periodic.py
index f6cc6a28..4816ee1e 100644
--- a/oslo_service/tests/test_periodic.py
+++ b/oslo_service/tests/test_periodic.py
@@ -81,13 +81,13 @@ class PeriodicTasksTestCase(base.ServiceBaseTestCase):
         serv.add_periodic_task(ext2)
         serv.run_periodic_tasks(None)
         # Time: 340
-        self.assertEqual(serv.called['doit'], 0)
-        self.assertEqual(serv.called['urg'], 0)
+        self.assertEqual(0, serv.called['doit'])
+        self.assertEqual(0, serv.called['urg'])
         # New last run will be 350
-        self.assertEqual(serv.called['ticks'], 1)
-        self.assertEqual(serv.called['tocks'], 0)
-        self.assertEqual(external_called['ext1'], 0)
-        self.assertEqual(external_called['ext2'], 0)
+        self.assertEqual(1, serv.called['ticks'])
+        self.assertEqual(0, serv.called['tocks'])
+        self.assertEqual(0, external_called['ext1'])
+        self.assertEqual(0, external_called['ext2'])
 
         time = time + periodic_task.DEFAULT_INTERVAL
         mock_now.return_value = time
@@ -95,33 +95,33 @@ class PeriodicTasksTestCase(base.ServiceBaseTestCase):
 
         # Time:400
         # New Last run: 420
-        self.assertEqual(serv.called['doit'], 1)
-        self.assertEqual(serv.called['urg'], 1)
+        self.assertEqual(1, serv.called['doit'])
+        self.assertEqual(1, serv.called['urg'])
         # Closest multiple of 70 is 420
-        self.assertEqual(serv.called['ticks'], 1)
-        self.assertEqual(serv.called['tocks'], 0)
-        self.assertEqual(external_called['ext1'], 1)
-        self.assertEqual(external_called['ext2'], 0)
+        self.assertEqual(1, serv.called['ticks'])
+        self.assertEqual(0, serv.called['tocks'])
+        self.assertEqual(1, external_called['ext1'])
+        self.assertEqual(0, external_called['ext2'])
 
         time = time + periodic_task.DEFAULT_INTERVAL / 2
         mock_now.return_value = time
         serv.run_periodic_tasks(None)
-        self.assertEqual(serv.called['doit'], 1)
-        self.assertEqual(serv.called['urg'], 1)
-        self.assertEqual(serv.called['ticks'], 2)
-        self.assertEqual(serv.called['tocks'], 1)
-        self.assertEqual(external_called['ext1'], 1)
-        self.assertEqual(external_called['ext2'], 1)
+        self.assertEqual(1, serv.called['doit'])
+        self.assertEqual(1, serv.called['urg'])
+        self.assertEqual(2, serv.called['ticks'])
+        self.assertEqual(1, serv.called['tocks'])
+        self.assertEqual(1, external_called['ext1'])
+        self.assertEqual(1, external_called['ext2'])
 
         time = time + periodic_task.DEFAULT_INTERVAL
         mock_now.return_value = time
         serv.run_periodic_tasks(None)
-        self.assertEqual(serv.called['doit'], 2)
-        self.assertEqual(serv.called['urg'], 2)
-        self.assertEqual(serv.called['ticks'], 3)
-        self.assertEqual(serv.called['tocks'], 2)
-        self.assertEqual(external_called['ext1'], 2)
-        self.assertEqual(external_called['ext2'], 2)
+        self.assertEqual(2, serv.called['doit'])
+        self.assertEqual(2, serv.called['urg'])
+        self.assertEqual(3, serv.called['ticks'])
+        self.assertEqual(2, serv.called['tocks'])
+        self.assertEqual(2, external_called['ext1'])
+        self.assertEqual(2, external_called['ext2'])
 
     @mock.patch('oslo_service.periodic_task.now')
     def test_called_correct(self, mock_now):
@@ -145,7 +145,7 @@ class PeriodicTasksTestCase(base.ServiceBaseTestCase):
         serv = AService(self.conf)
         for i in range(200):
             serv.run_periodic_tasks(None)
-            self.assertEqual(serv.called['ticks'], int(i / test_spacing))
+            self.assertEqual(int(i / test_spacing), serv.called['ticks'])
             time += 1
             mock_now.return_value = time
 
diff --git a/oslo_service/tests/test_service.py b/oslo_service/tests/test_service.py
index ee635a31..d955d7c9 100644
--- a/oslo_service/tests/test_service.py
+++ b/oslo_service/tests/test_service.py
@@ -51,7 +51,7 @@ class ServiceManagerTestCase(test_base.BaseTestCase):
     def test_override_manager_method(self):
         serv = ExtendedService()
         serv.start()
-        self.assertEqual(serv.test_method(), 'service')
+        self.assertEqual('service', serv.test_method())
 
 
 class ServiceWithTimer(service.Service):
@@ -207,20 +207,20 @@ class ServiceLauncherTest(ServiceTestBase):
         self._terminate_with_signal(signal.SIGKILL)
         status = self._reap_test()
         self.assertTrue(os.WIFSIGNALED(status))
-        self.assertEqual(os.WTERMSIG(status), signal.SIGKILL)
+        self.assertEqual(signal.SIGKILL, os.WTERMSIG(status))
 
     def test_terminate_sigterm(self):
         self._terminate_with_signal(signal.SIGTERM)
         status = self._reap_test()
         self.assertTrue(os.WIFEXITED(status))
-        self.assertEqual(os.WEXITSTATUS(status), 0)
+        self.assertEqual(0, os.WEXITSTATUS(status))
 
     def test_crashed_service(self):
         service_maker = lambda: ServiceCrashOnStart()
         self.pid = self._spawn_service(service_maker=service_maker)
         status = self._reap_test()
         self.assertTrue(os.WIFEXITED(status))
-        self.assertEqual(os.WEXITSTATUS(status), 1)
+        self.assertEqual(1, os.WEXITSTATUS(status))
 
     def test_child_signal_sighup(self):
         start_workers = self._spawn()
@@ -282,7 +282,7 @@ class ServiceRestartTest(ServiceTestBase):
 
         status = self._reap_test()
         self.assertTrue(os.WIFEXITED(status))
-        self.assertEqual(os.WEXITSTATUS(status), 0)
+        self.assertEqual(0, os.WEXITSTATUS(status))
 
     def test_mutate_hook_service_launcher(self):
         """Test mutate_config_files is called by ServiceLauncher on SIGHUP.
diff --git a/oslo_service/tests/test_wsgi.py b/oslo_service/tests/test_wsgi.py
index a80ad3a6..2b920cd9 100644
--- a/oslo_service/tests/test_wsgi.py
+++ b/oslo_service/tests/test_wsgi.py
@@ -130,8 +130,8 @@ class TestWSGIServer(WsgiTestCase):
     def test_custom_max_header_line(self):
         self.config(max_header_line=4096)  # Default value is 16384
         wsgi.Server(self.conf, "test_custom_max_header_line", None)
-        self.assertEqual(self.conf.max_header_line,
-                         eventlet.wsgi.MAX_HEADER_LINE)
+        self.assertEqual(eventlet.wsgi.MAX_HEADER_LINE,
+                         self.conf.max_header_line)
 
     def test_start_random_port(self):
         server = wsgi.Server(self.conf, "test_random_port", None,
@@ -212,14 +212,14 @@ class TestWSGIServer(WsgiTestCase):
         uri = "http://127.0.0.1:%d/%s" % (server.port, 10000 * 'x')
         resp = requests.get(uri, proxies={"http": ""})
         eventlet.sleep(0)
-        self.assertNotEqual(resp.status_code,
-                            requests.codes.REQUEST_URI_TOO_LARGE)
+        self.assertNotEqual(requests.codes.REQUEST_URI_TOO_LARGE,
+                            resp.status_code)
 
         uri = "http://127.0.0.1:%d/%s" % (server.port, 20000 * 'x')
         resp = requests.get(uri, proxies={"http": ""})
         eventlet.sleep(0)
-        self.assertEqual(resp.status_code,
-                         requests.codes.REQUEST_URI_TOO_LARGE)
+        self.assertEqual(requests.codes.REQUEST_URI_TOO_LARGE,
+                         resp.status_code)
         server.stop()
         server.wait()
 
@@ -230,12 +230,12 @@ class TestWSGIServer(WsgiTestCase):
 
         # Stopping the server, which in turn sets pool size to 0
         server.stop()
-        self.assertEqual(server._pool.size, 0)
+        self.assertEqual(0, server._pool.size)
 
         # Resetting pool size to default
         server.reset()
         server.start()
-        self.assertEqual(server._pool.size, CONF.wsgi_default_pool_size)
+        self.assertEqual(CONF.wsgi_default_pool_size, server._pool.size)
 
     def test_client_socket_timeout(self):
         self.config(client_socket_timeout=5)