diff --git a/convert2rhel/checks.py b/convert2rhel/checks.py
index cb008e4015..b6853a1ba1 100644
--- a/convert2rhel/checks.py
+++ b/convert2rhel/checks.py
@@ -203,7 +203,7 @@ def check_convert2rhel_latest():
             if "CONVERT2RHEL_ALLOW_OLDER_VERSION" not in os.environ:
                 logger.warning(
                     "You are using the deprecated 'CONVERT2RHEL_UNSUPPORTED_VERSION'"
-                    " environment variable.  Please switch to 'CONVERT2RHEL_ALLOW_OLDER_VERSION'"
+                    " environment variable. Please switch to 'CONVERT2RHEL_ALLOW_OLDER_VERSION'"
                     " instead."
                 )
 
@@ -783,7 +783,7 @@ def is_loaded_kernel_latest():
             if "CONVERT2RHEL_UNSUPPORTED_SKIP_KERNEL_CURRENCY_CHECK" in os.environ:
                 logger.warning(
                     "You are using the deprecated 'CONVERT2RHEL_UNSUPPORTED_SKIP_KERNEL_CURRENCY_CHECK'"
-                    " environment variable.  Please switch to 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK'"
+                    " environment variable. Please switch to 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK'"
                     " instead."
                 )
 
diff --git a/convert2rhel/unit_tests/checks_test.py b/convert2rhel/unit_tests/checks_test.py
index 791509bb83..f1b8b37d44 100644
--- a/convert2rhel/unit_tests/checks_test.py
+++ b/convert2rhel/unit_tests/checks_test.py
@@ -417,7 +417,7 @@ def test_c2r_up_to_date_deprecated_env_var(self, caplog, convert2rhel_latest_ver
 
         log_msg = (
             "You are using the deprecated 'CONVERT2RHEL_UNSUPPORTED_VERSION'"
-            " environment variable.  Please switch to 'CONVERT2RHEL_ALLOW_OLDER_VERSION'"
+            " environment variable. Please switch to 'CONVERT2RHEL_ALLOW_OLDER_VERSION'"
             " instead."
         )
 
@@ -1462,7 +1462,7 @@ def test_is_loaded_kernel_latest_unsupported_skip(
             "Detected 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK' environment variable, we will skip "
             "the kernel-core comparison.\nBeware, this could leave your system in a broken state.",
             "You are using the deprecated 'CONVERT2RHEL_UNSUPPORTED_SKIP_KERNEL_CURRENCY_CHECK'"
-            " environment variable.  Please switch to 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK'"
+            " environment variable. Please switch to 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK'"
             " instead.",
         ),
         (
@@ -1484,7 +1484,7 @@ def test_is_loaded_kernel_latest_unsupported_skip(
             "Detected 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK' environment variable, we will skip "
             "the kernel-core comparison.\nBeware, this could leave your system in a broken state.",
             "You are using the deprecated 'CONVERT2RHEL_UNSUPPORTED_SKIP_KERNEL_CURRENCY_CHECK'"
-            " environment variable.  Please switch to 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK'"
+            " environment variable. Please switch to 'CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK'"
             " instead.",
         ),
     ),
diff --git a/plans/rerun.fmf b/plans/rerun.fmf
index 70950394de..4e009cc6cd 100644
--- a/plans/rerun.fmf
+++ b/plans/rerun.fmf
@@ -132,6 +132,29 @@
                 filter: tag:disable-data-collection
 
 
+/sub_man_rollback:
+    summary: |
+        Back up and restore subscription-manager
+    description: |
+        When the subscription-manager package is installed from the BaseOS repository prior to running convert2rhel, it is
+        removed during the conversion run. This test makes sure that subscription-manager and its dependencies are correctly
+        backed up and re-installed during the rollback together with the certificate.
+
+
+    enabled: false
+
+    adjust+:
+        - enabled: true
+          when: >
+              distro == centos-8
+        - environment+:
+            TEST_REQUIRES: subscription-manager
+
+
+    discover+:
+        filter: tag:sub-man-rollback
+
+
 /custom_kernel:
     summary: |
         Custom kernel
@@ -176,29 +199,6 @@
             filter: tag:yum-excld-kernel
 
 
-/sub_man_rollback:
-    summary: |
-        Back up and restore subscription-manager
-    description: |
-        When the subscription-manager package is installed from the BaseOS repository prior to running convert2rhel, it is
-        removed during the conversion run. This test makes sure that subscription-manager and its dependencies are correctly
-        backed up and re-installed during the rollback together with the certificate.
-
-
-    enabled: false
-
-    adjust+:
-        - enabled: true
-          when: >
-              distro == centos-8
-        - environment+:
-            TEST_REQUIRES: subscription-manager
-
-
-    discover+:
-        filter: tag:sub-man-rollback
-
-
 /single_yum_transaction_validation:
     summary: |
         Single yum transaction validation