diff --git a/robottelo/utils/datafactory.py b/robottelo/utils/datafactory.py
index 8d6c82a981..7e8fe7544d 100644
--- a/robottelo/utils/datafactory.py
+++ b/robottelo/utils/datafactory.py
@@ -496,26 +496,35 @@ def valid_http_credentials(url_encoded=False):
             'quote': False,
             'http_valid': True,
         },
-        {'login': 'admin', 'pass': '', 'quote': False, 'http_valid': False},
-        {'login': '', 'pass': 'mypassword', 'quote': False, 'http_valid': False},
-        {'login': '', 'pass': '', 'quote': False, 'http_valid': False},
+        {'login': 'admin', 'pass': '', 'quote': False, 'http_valid': False, 'yum_compatible': True},
+        {
+            'login': '',
+            'pass': 'mypassword',
+            'quote': False,
+            'http_valid': False,
+            'yum_compatible': False,
+        },
+        {'login': '', 'pass': '', 'quote': False, 'http_valid': False, 'yum_compatible': True},
         {
             'login': gen_string('alpha', gen_integer(1, 512)),
             'pass': gen_string('alpha'),
             'quote': False,
             'http_valid': False,
+            'yum_compatible': False,
         },
         {
             'login': gen_string('alphanumeric', gen_integer(1, 512)),
             'pass': gen_string('alphanumeric'),
             'quote': False,
             'http_valid': False,
+            'yum_compatible': False,
         },
         {
             'login': gen_string('utf8', gen_integer(1, 50)),
             'pass': gen_string('utf8'),
             'quote': True,
             'http_valid': False,
+            'yum_compatible': False,
             'encoding': 'utf8',
         },
     ]
diff --git a/tests/foreman/cli/test_repository.py b/tests/foreman/cli/test_repository.py
index 5173fcb9cc..1bbfefae25 100644
--- a/tests/foreman/cli/test_repository.py
+++ b/tests/foreman/cli/test_repository.py
@@ -716,16 +716,14 @@ def test_positive_synchronize_file_repo(self, repo_options, repo, target_sat):
         'repo_options',
         **parametrized(
             [
-                (
-                    {
-                        'content-type': 'yum',
-                        'url': FAKE_5_YUM_REPO,
-                        'upstream-username': creds['login'],
-                        'upstream-password': creds['pass'],
-                    }
-                    for creds in valid_http_credentials()
-                    if not creds['http_valid']
-                )
+                {
+                    'content-type': 'yum',
+                    'url': FAKE_5_YUM_REPO,
+                    'upstream-username': creds['login'],
+                    'upstream-password': creds['pass'],
+                }
+                for creds in valid_http_credentials()
+                if not creds['http_valid'] and creds.get('yum_compatible')
             ]
         ),
         indirect=['repo_options'],
@@ -747,7 +745,8 @@ def test_negative_synchronize_auth_yum_repo(self, repo, target_sat):
         response = target_sat.cli.Task.progress(
             {'id': repo_sync[0]['id']}, return_raw_response=True
         )
-        assert "Error: 401, message='Unauthorized'" in response.stderr[1].decode('utf-8')
+
+        assert "Error: 401, message='Unauthorized'" in response.stderr
 
     @pytest.mark.tier2
     @pytest.mark.upgrade