diff --git a/test_suite/generic/test_generic.py b/test_suite/generic/test_generic.py
index fea9605e..5a3753e2 100644
--- a/test_suite/generic/test_generic.py
+++ b/test_suite/generic/test_generic.py
@@ -600,7 +600,7 @@ def test_subscription_manager_auto(self, host, instance_data):
                 print(f'Waiting {interval}s for auto-registration to succeed...')
                 time.sleep(interval)
 
-    def test_subscription_manager_auto_config(self, host):
+    def test_subscription_manager_autoregv1_config(self, host):
         """
         BugZilla: 1932802, 1905398
         Verify that auto_registration is enabled in the image
@@ -619,6 +619,25 @@ def test_subscription_manager_auto_config(self, host):
 
             assert host.service('rhsmcertd').is_enabled, \
                 'rhsmcertd service is expected to be enabled'
+    
+    def test_subscription_manager_autoregv2_config(self, host):
+        """
+
+        """
+        expected_config = [
+            'auto_register = 1',
+            'manage_repos = 1'
+        ]
+
+        file_to_check = '/etc/rhsm/rhsm.conf'
+
+        with host.sudo():
+            for item in expected_config:
+                assert host.file(file_to_check).contains(item), \
+                    f'{file_to_check} has unexpected content'
+
+            assert host.service('rhsmcertd').is_enabled, \
+                'rhsmcertd service is expected to be enabled'
 
 
 @pytest.mark.order(1)