diff --git a/zun/tests/unit/api/controllers/v1/test_zun_service.py b/zun/tests/unit/api/controllers/v1/test_zun_service.py
index 6ae40df8a..70f443648 100644
--- a/zun/tests/unit/api/controllers/v1/test_zun_service.py
+++ b/zun/tests/unit/api/controllers/v1/test_zun_service.py
@@ -49,8 +49,8 @@ class TestZunServiceController(api_base.FunctionalTest):
         svc_up.return_value = "up"
 
         response = self.get_json('/services')
-        self.assertEqual(len(response['services']), 1)
-        self.assertEqual(response['services'][0]['id'], 1)
+        self.assertEqual(1, len(response['services']))
+        self.assertEqual(1, response['services'][0]['id'])
 
     @mock.patch.object(objects.ZunService, 'list')
     @mock.patch.object(servicegroup.ServiceGroup, 'service_is_up')
diff --git a/zun/tests/unit/conf/test_conf.py b/zun/tests/unit/conf/test_conf.py
index 74f6facbc..dfcb693b7 100644
--- a/zun/tests/unit/conf/test_conf.py
+++ b/zun/tests/unit/conf/test_conf.py
@@ -24,7 +24,7 @@ class ConfTestCase(base.TestCase):
     def test_list_opts(self):
         for group, opt_list in opts.list_opts():
             if isinstance(group, six.string_types):
-                self.assertEqual(group, 'DEFAULT')
+                self.assertEqual('DEFAULT', group)
             else:
                 self.assertIsInstance(group, cfg.OptGroup)
             for opt in opt_list:
diff --git a/zun/tests/unit/container/docker/test_docker_driver.py b/zun/tests/unit/container/docker/test_docker_driver.py
index 4e6f94062..3393307b0 100644
--- a/zun/tests/unit/container/docker/test_docker_driver.py
+++ b/zun/tests/unit/container/docker/test_docker_driver.py
@@ -106,7 +106,7 @@ class TestDockerDriver(base.DriverTestCase):
         }
         self.mock_docker.create_container.assert_called_once_with(
             mock_container.image, **kwargs)
-        self.assertEqual(result_container.container_id, 'val1')
+        self.assertEqual('val1', result_container.container_id)
         self.assertEqual(result_container.status,
                          fields.ContainerStatus.STOPPED)
 
diff --git a/zun/tests/unit/scheduler/test_scheduler.py b/zun/tests/unit/scheduler/test_scheduler.py
index abce78b6b..7457a36bf 100644
--- a/zun/tests/unit/scheduler/test_scheduler.py
+++ b/zun/tests/unit/scheduler/test_scheduler.py
@@ -40,7 +40,7 @@ class SchedulerTestCase(base.TestCase):
         mock_service_is_up.side_effect = [False, True]
 
         result = self.driver.hosts_up(self.context)
-        self.assertEqual(result, ['host2'])
+        self.assertEqual(['host2'], result)
 
         mock_list_by_binary.assert_called_once_with(self.context,
                                                     'zun-compute')