diff --git a/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.info.yml b/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.info.yml
index 135022d..352be5c 100644
--- a/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.info.yml
+++ b/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.info.yml
@@ -1,4 +1,4 @@
-name: 'Upgrade status test function'
+name: 'Upgrade status test deprecated function'
 type: module
 description: 'Support module for upgrade status module testing.'
 package: Testing
diff --git a/tests/src/Functional/UpgradeStatusTestBase.php b/tests/src/Functional/UpgradeStatusTestBase.php
index aa94d79..9ce1cc3 100644
--- a/tests/src/Functional/UpgradeStatusTestBase.php
+++ b/tests/src/Functional/UpgradeStatusTestBase.php
@@ -45,7 +45,6 @@ abstract class UpgradeStatusTestBase extends BrowserTestBase {
    * Perform a full scan on all test modules.
    */
   protected function runFullScan() {
-    $drupal_major = (int) \Drupal::VERSION;
     $edit = [
       'scan[data][list][upgrade_status_test_error]' => TRUE,
       'scan[data][list][upgrade_status_test_no_error]' => TRUE,
@@ -59,11 +58,21 @@ abstract class UpgradeStatusTestBase extends BrowserTestBase {
       // Due to the automated core compatibility assignment of test modules,
       // the category of this module may be different based on major Drupal
       // version.
-      ($drupal_major < 9 ? 'collaborate' : 'relax') . '[data][list][upgrade_status_test_contrib_error]' => TRUE,
+      ($this->getDrupalCoreMajorVersion() < 9 ? 'collaborate' : 'relax') . '[data][list][upgrade_status_test_contrib_error]' => TRUE,
       'relax[data][list][upgrade_status]' => TRUE,
       'relax[data][list][upgrade_status_test_contrib_no_error]' => TRUE,
     ];
     $this->drupalPostForm('admin/reports/upgrade-status', $edit, 'Scan selected');
   }
 
+  /**
+   * Returns current core's major version.
+   *
+   * @return int
+   *   Version converted to int.
+   */
+  protected function getDrupalCoreMajorVersion(): int {
+    return (int) \Drupal::VERSION;
+  }
+
 }
diff --git a/tests/src/Functional/UpgradeStatusUiTest.php b/tests/src/Functional/UpgradeStatusUiTest.php
index c1afba6..0a302fb 100644
--- a/tests/src/Functional/UpgradeStatusUiTest.php
+++ b/tests/src/Functional/UpgradeStatusUiTest.php
@@ -93,7 +93,10 @@ class UpgradeStatusUiTest extends UpgradeStatusTestBase {
     $edit = [
       'manual[data][list][upgrade_status_test_error]' => TRUE,
       'relax[data][list][upgrade_status_test_no_error]' => TRUE,
-      'collaborate[data][list][upgrade_status_test_contrib_error]' => TRUE,
+      // Due to the automated core compatibility assignment of test modules,
+      // the category of this module may be different based on major Drupal
+      // version.
+      ($this->getDrupalCoreMajorVersion() < 9 ? 'collaborate' : 'relax') . '[data][list][upgrade_status_test_contrib_error]' => TRUE,
     ];
     $expected = [
       'Export selected as HTML' => ['Contributed projects', 'Custom projects'],