diff --git a/sushy/main.py b/sushy/main.py
index bf8737df..2be5dd37 100644
--- a/sushy/main.py
+++ b/sushy/main.py
@@ -328,6 +328,7 @@ class Sushy(base.ResourceBase):
         resource_package_name = __name__
         for json_file in pkg_resources.resource_listdir(
             resource_package_name, STANDARD_REGISTRY_PATH):
+                # Not using path.join according to pkg_resources docs
                 mes_reg = message_registry.MessageRegistry(
                     None, STANDARD_REGISTRY_PATH + json_file,
                     reader=base.JsonPackagedFileReader(resource_package_name))
diff --git a/sushy/tests/unit/test_main.py b/sushy/tests/unit/test_main.py
index adafdebf..a0f39b75 100644
--- a/sushy/tests/unit/test_main.py
+++ b/sushy/tests/unit/test_main.py
@@ -191,8 +191,7 @@ class MainTestCase(base.TestCase):
         registries = self.root._get_standard_message_registry_collection()
 
         self.assertEqual(5, len(registries))
-        self.assertTrue([r.identity for r in registries
-                        if r.identity == 'Base.1.3.0'])
+        self.assertIn('Base.1.3.0', {r.identity for r in registries})
 
     @mock.patch('sushy.Sushy._get_standard_message_registry_collection',
                 autospec=True)