diff --git a/osc_lib/tests/cli/test_parseractions.py b/osc_lib/tests/cli/test_parseractions.py
index 370bcafa..7e4dc2a7 100644
--- a/osc_lib/tests/cli/test_parseractions.py
+++ b/osc_lib/tests/cli/test_parseractions.py
@@ -136,7 +136,7 @@ class TestMultiKeyValueAction(utils.TestCase):
             {'req1': 'aaa', 'req2': 'bbb'},
             {'req1': '', 'req2': ''},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
     def test_empty_required_optional(self):
         self.parser.add_argument(
@@ -160,7 +160,7 @@ class TestMultiKeyValueAction(utils.TestCase):
             {'req1': 'aaa', 'req2': 'bbb'},
             {'req1': '', 'req2': ''},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
     def test_error_values_with_comma(self):
         data_list = [
@@ -254,7 +254,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         expect = [
             {'req1': 'aaa,bbb'},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
         results = self.parser.parse_args([
             '--test', 'req1=',
@@ -263,7 +263,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         expect = [
             {'req1': ''},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
         results = self.parser.parse_args([
             '--test', 'req1=aaa,bbb',
@@ -274,7 +274,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
             {'req1': 'aaa,bbb'},
             {'req1': ''},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
     def test_mkvca_optional(self):
         results = self.parser.parse_args([
@@ -284,7 +284,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         expect = [
             {'req1': 'aaa,bbb'},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
         results = self.parser.parse_args([
             '--test', 'req1=aaa,bbb',
@@ -295,7 +295,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
             {'req1': 'aaa,bbb'},
             {'req1': '', 'opt2': 'ccc'},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
         try:
             results = self.parser.parse_args([
@@ -318,7 +318,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
             'req1': 'aaa,bbb',
             'opt2': 'ccc',
         }]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
     def test_mkvca_no_required_optional(self):
         self.parser.add_argument(
@@ -339,7 +339,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         expect = [
             {'req1': 'aaa,bbb'},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
         results = self.parser.parse_args([
             '--test-empty', 'xyz=aaa,bbb',
@@ -349,7 +349,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         expect = [
             {'xyz': 'aaa,bbb'},
         ]
-        self.assertItemsEqual(expect, actual)
+        self.assertCountEqual(expect, actual)
 
     def test_mkvca_invalid_key(self):
         try:
diff --git a/osc_lib/tests/utils/test_tags.py b/osc_lib/tests/utils/test_tags.py
index 5bdbc139..6b75aab0 100644
--- a/osc_lib/tests/utils/test_tags.py
+++ b/osc_lib/tests/utils/test_tags.py
@@ -37,19 +37,19 @@ class TestTags(test_utils.TestCase):
 
         actual = getattr(parsed_args, 'tags', [])
         expected = ['tag1', 'tag2']
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
         actual = getattr(parsed_args, 'any_tags', [])
         expected = ['tag4']
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
         actual = getattr(parsed_args, 'not_tags', [])
         expected = ['tag5']
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
         actual = getattr(parsed_args, 'not_any_tags', [])
         expected = ['tag6']
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
     def test_get_tag_filtering_args(self):
         parser = argparse.ArgumentParser()
@@ -76,12 +76,12 @@ class TestTags(test_utils.TestCase):
         parsed_args = parser.parse_args(['--tag', 'tag1'])
         actual = getattr(parsed_args, 'tags', [])
         expected = ['tag1']
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
         parsed_args = parser.parse_args(['--no-tag'])
         actual = getattr(parsed_args, 'no-tag', [])
         expected = []
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
     def test_add_tag_option_to_parser_for_set(self):
         parser = argparse.ArgumentParser()
@@ -90,12 +90,12 @@ class TestTags(test_utils.TestCase):
         parsed_args = parser.parse_args(['--tag', 'tag1'])
         actual = getattr(parsed_args, 'tags', [])
         expected = ['tag1']
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
         parsed_args = parser.parse_args(['--no-tag'])
         actual = getattr(parsed_args, 'no-tag', [])
         expected = []
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
     def test_add_tag_option_to_parser_for_unset(self):
         parser = argparse.ArgumentParser()
@@ -108,12 +108,12 @@ class TestTags(test_utils.TestCase):
         parsed_args = parser.parse_args(['--tag', 'tag1'])
         actual = getattr(parsed_args, 'tags', [])
         expected = ['tag1']
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
         parsed_args = parser.parse_args(['--all-tag'])
         actual = getattr(parsed_args, 'all-tag', [])
         expected = []
-        self.assertItemsEqual(expected, actual)
+        self.assertCountEqual(expected, actual)
 
     def test_update_tags_for_set(self):
         mock_client = mock.MagicMock()