diff --git a/os_brick/tests/initiator/connectors/test_disco.py b/os_brick/tests/initiator/connectors/test_disco.py
index e5d0da08a..bfd11c9cd 100644
--- a/os_brick/tests/initiator/connectors/test_disco.py
+++ b/os_brick/tests/initiator/connectors/test_disco.py
@@ -144,7 +144,7 @@ class DISCOConnectorTestCase(test_connector.ConnectorTestCase):
         """Test to get all the available DISCO volumes."""
         expected = ['/dev/dms1234567']
         actual = self.connector.get_all_available_volumes(None)
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
     def test_extend_volume(self):
         self.assertRaises(NotImplementedError,
diff --git a/os_brick/tests/initiator/connectors/test_fibre_channel.py b/os_brick/tests/initiator/connectors/test_fibre_channel.py
index 6f53ed626..874d8c2fc 100644
--- a/os_brick/tests/initiator/connectors/test_fibre_channel.py
+++ b/os_brick/tests/initiator/connectors/test_fibre_channel.py
@@ -424,7 +424,7 @@ class FibreChannelConnectorTestCase(test_connector.ConnectorTestCase):
         mock_isdir.return_value = False
         expected = []
         actual = self.connector.get_all_available_volumes()
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
     @mock.patch('eventlet.greenthread.sleep', mock.Mock())
     @mock.patch.object(linuxscsi.LinuxSCSI, 'find_multipath_device')
diff --git a/os_brick/tests/initiator/connectors/test_iscsi.py b/os_brick/tests/initiator/connectors/test_iscsi.py
index 5bb76c019..b4bacd841 100644
--- a/os_brick/tests/initiator/connectors/test_iscsi.py
+++ b/os_brick/tests/initiator/connectors/test_iscsi.py
@@ -919,7 +919,7 @@ Setting up iSCSI targets: unused
         mock_isdir.return_value = False
         expected = []
         actual = self.connector.get_all_available_volumes()
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
     @mock.patch.object(iscsi.ISCSIConnector, '_get_device_path')
     def test_get_potential_paths_mpath(self, get_path_mock):
diff --git a/os_brick/tests/windows/test_fibre_channel.py b/os_brick/tests/windows/test_fibre_channel.py
index 3617aa23b..35663d30d 100644
--- a/os_brick/tests/windows/test_fibre_channel.py
+++ b/os_brick/tests/windows/test_fibre_channel.py
@@ -60,7 +60,7 @@ class WindowsFCConnectorTestCase(test_base.WindowsConnectorTestBase):
         else:
             expected_props = {}
 
-        self.assertItemsEqual(expected_props, props)
+        self.assertCountEqual(expected_props, props)
 
     @mock.patch.object(fc.WindowsFCConnector, '_get_scsi_wwn')
     @mock.patch.object(fc.WindowsFCConnector, 'get_volume_paths')