diff --git a/troveclient/tests/test_client.py b/troveclient/tests/test_client.py
index 52d05f8b..a22d4702 100644
--- a/troveclient/tests/test_client.py
+++ b/troveclient/tests/test_client.py
@@ -30,7 +30,7 @@ class ClientTest(testtools.TestCase):
         version_map = other_client.get_version_map()
         output = client.BaseClient.get_class('database',
                                              '1.0', version_map)
-        self.assertEqual(output, troveclient.v1.client.Client)
+        self.assertEqual(troveclient.v1.client.Client, output)
 
     def test_get_client_class_unknown(self):
         version_map = other_client.get_version_map()
diff --git a/troveclient/tests/test_discover.py b/troveclient/tests/test_discover.py
index 3c62e8e8..09f1ad1d 100644
--- a/troveclient/tests/test_discover.py
+++ b/troveclient/tests/test_discover.py
@@ -40,7 +40,7 @@ class DiscoverTest(testtools.TestCase):
         def test():
             shell = troveclient.shell.OpenStackTroveShell()
             for name, module in shell._discover_via_entry_points():
-                self.assertEqual(name, 'foo')
+                self.assertEqual('foo', name)
                 self.assertTrue(inspect.ismodule(module))
 
         test()
@@ -68,13 +68,13 @@ class DiscoverTest(testtools.TestCase):
         def test():
             shell = troveclient.shell.OpenStackTroveShell()
             extensions = shell._discover_extensions('1.0')
-            self.assertEqual(len(extensions), 3)
+            self.assertEqual(3, len(extensions))
             names = sorted(['foo', 'bar', 'baz'])
             sorted_extensions = sorted(extensions, key=lambda ext: ext.name)
             for i in range(len(names)):
                 ext = sorted_extensions[i]
                 name = names[i]
-                self.assertEqual(ext.name, name)
+                self.assertEqual(name, ext.name)
                 self.assertTrue(inspect.ismodule(ext.module))
 
         test()