diff --git a/barbicanclient/tests/test_containers.py b/barbicanclient/tests/test_containers.py
index 1327216..0b785a9 100644
--- a/barbicanclient/tests/test_containers.py
+++ b/barbicanclient/tests/test_containers.py
@@ -17,6 +17,7 @@ import json
 
 import mock
 from oslo_utils import timeutils
+import six
 
 from barbicanclient import acls
 from barbicanclient.tests import test_client
@@ -197,7 +198,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
         container_req = json.loads(self.responses.last_request.text)
         self.assertEqual(self.container.name, container_req['name'])
         self.assertEqual('certificate', container_req['type'])
-        self.assertItemsEqual(self.container.certificate_secret_refs_json,
+        six.assertCountEqual(self, self.container.certificate_secret_refs_json,
                               container_req['secret_refs'])
 
     def test_should_store_certificate_via_constructor(self):
@@ -222,7 +223,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
         container_req = json.loads(self.responses.last_request.text)
         self.assertEqual(self.container.name, container_req['name'])
         self.assertEqual('certificate', container_req['type'])
-        self.assertItemsEqual(self.container.certificate_secret_refs_json,
+        six.assertCountEqual(self, self.container.certificate_secret_refs_json,
                               container_req['secret_refs'])
 
     def test_should_store_rsa_via_attributes(self):
@@ -246,7 +247,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
         container_req = json.loads(self.responses.last_request.text)
         self.assertEqual(self.container.name, container_req['name'])
         self.assertEqual('rsa', container_req['type'])
-        self.assertItemsEqual(self.container.rsa_secret_refs_json,
+        six.assertCountEqual(self, self.container.rsa_secret_refs_json,
                               container_req['secret_refs'])
 
     def test_should_store_rsa_via_constructor(self):
@@ -271,7 +272,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
         container_req = json.loads(self.responses.last_request.text)
         self.assertEqual(self.container.name, container_req['name'])
         self.assertEqual('rsa', container_req['type'])
-        self.assertItemsEqual(self.container.rsa_secret_refs_json,
+        six.assertCountEqual(self, self.container.rsa_secret_refs_json,
                               container_req['secret_refs'])
 
     def test_should_get_secret_refs_when_created_using_secret_objects(self):