diff --git a/tests/modules/upgrade_status_test_contrib_error/src/Controller/UpgradeStatusTestContribErrorController.php b/tests/modules/upgrade_status_test_contrib_error/src/Controller/UpgradeStatusTestContribErrorController.php
index 0c756f4..29838ba 100644
--- a/tests/modules/upgrade_status_test_contrib_error/src/Controller/UpgradeStatusTestContribErrorController.php
+++ b/tests/modules/upgrade_status_test_contrib_error/src/Controller/UpgradeStatusTestContribErrorController.php
@@ -10,7 +10,7 @@ use Drupal\Core\Controller\ControllerBase;
 class UpgradeStatusTestContribErrorController extends ControllerBase {

   public function content() {
-    upgrade_status_test_deprecated_function_call();
+    upgrade_status_test_contrib_error_function();
   }

 }
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
deleted file mode 100644
index 352be5c..0000000
--- a/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.info.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Upgrade status test deprecated function'
-type: module
-description: 'Support module for upgrade status module testing.'
-package: Testing
-version: VERSION
-core_version_requirement: ^8 || ^9
diff --git a/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.module b/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.module
deleted file mode 100644
index 7288816..0000000
--- a/tests/modules/upgrade_status_test_deprecated_function/upgrade_status_test_deprecated_function.module
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Tests function deprecation detection.
- *
- * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use the
- *   replacement instead.
- */
-function upgrade_status_test_deprecated_function_call() {
-  @trigger_error("upgrade_status_test_deprecated_function_call() is deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use the replacement instead. See LINK", E_USER_DEPRECATED);
-}
diff --git a/tests/modules/upgrade_status_test_contrib_error/upgrade_status_test_contrib_error.module b/tests/modules/upgrade_status_test_contrib_error/upgrade_status_test_contrib_error.module
new file mode 100644
index 0000000..91314e0
--- /dev/null
+++ b/tests/modules/upgrade_status_test_contrib_error/upgrade_status_test_contrib_error.module
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Tests function deprecation detection.
+ *
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use the
+ *   replacement instead.
+ */
+function upgrade_status_test_contrib_error_function() {
+  @trigger_error("upgrade_status_test_contrib_error_function() is deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use the replacement instead. See LINK", E_USER_DEPRECATED);
+}
diff --git a/tests/modules/upgrade_status_test_error/src/Controller/UpgradeStatusTestErrorController.php b/tests/modules/upgrade_status_test_error/src/Controller/UpgradeStatusTestErrorController.php
index a3aa0c4..201bea9 100644
--- a/tests/modules/upgrade_status_test_error/src/Controller/UpgradeStatusTestErrorController.php
+++ b/tests/modules/upgrade_status_test_error/src/Controller/UpgradeStatusTestErrorController.php
@@ -10,7 +10,7 @@ use Drupal\Core\Controller\ControllerBase;
 class UpgradeStatusTestErrorController extends ControllerBase {

   public function content() {
-    upgrade_status_test_deprecated_function_call();
+    upgrade_status_test_contrib_error_function();
   }

 }
diff --git a/tests/modules/upgrade_status_test_error/upgrade_status_test_error.info.yml b/tests/modules/upgrade_status_test_error/upgrade_status_test_error.info.yml
index 64d8a87..37389b0 100644
--- a/tests/modules/upgrade_status_test_error/upgrade_status_test_error.info.yml
+++ b/tests/modules/upgrade_status_test_error/upgrade_status_test_error.info.yml
@@ -3,3 +3,5 @@ type: module
 description: 'Support module for upgrade status module testing.'
 package: Testing
 version: VERSION
+dependencies:
+  -drupal:upgrade_status_contrib_error
diff --git a/tests/src/Functional/UpgradeStatusAnalyzeTest.php b/tests/src/Functional/UpgradeStatusAnalyzeTest.php
index 98bfefa..0d64de7 100644
--- a/tests/src/Functional/UpgradeStatusAnalyzeTest.php
+++ b/tests/src/Functional/UpgradeStatusAnalyzeTest.php
@@ -17,7 +17,6 @@ class UpgradeStatusAnalyzeTest extends UpgradeStatusTestBase {
     $key_value = \Drupal::service('keyvalue')->get('upgrade_status_scan_results');

     // Check if the project has scan result in the keyValueStorage.
-    $this->assertTrue($key_value->has('upgrade_status_test_deprecated_function'));
     $this->assertTrue($key_value->has('upgrade_status_test_error'));
     $this->assertTrue($key_value->has('upgrade_status_test_no_error'));
     $this->assertTrue($key_value->has('upgrade_status_test_submodules'));
@@ -33,11 +32,6 @@ class UpgradeStatusAnalyzeTest extends UpgradeStatusTestBase {
     // and we always want to run the scan on root modules.
     $this->assertFalse($key_value->has('upgrade_status_test_submodules_a'));

-    $report = $key_value->get('upgrade_status_test_deprecated_function');
-    $this->assertNotEmpty($report);
-    $this->assertEquals(0, $report['data']['totals']['file_errors']);
-    $this->assertCount(0, $report['data']['files']);
-
     $report = $key_value->get('upgrade_status_test_error');
     $this->assertNotEmpty($report);
     $this->assertEquals(4, $report['data']['totals']['file_errors']);
@@ -50,7 +44,7 @@ class UpgradeStatusAnalyzeTest extends UpgradeStatusTestBase {
     $file = next($report['data']['files']);
     $this->assertEquals('UpgradeStatusTestErrorController.php', basename(key($report['data']['files'])));
     $message = $file['messages'][0];
-    $this->assertEquals("Call to deprecated function upgrade_status_test_deprecated_function_call(). Deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use the replacement instead.", $message['message']);
+    $this->assertEquals("Call to deprecated function upgrade_status_test_contrib_error_function(). Deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use the replacement instead.", $message['message']);
     $this->assertEquals(13, $message['line']);
     $file = next($report['data']['files']);
     $this->assertEquals('ExtendingClass.php', basename(key($report['data']['files'])));
@@ -74,7 +68,7 @@ class UpgradeStatusAnalyzeTest extends UpgradeStatusTestBase {
     $this->assertCount(2, $report['data']['files']);
     $file = reset($report['data']['files']);
     $message = $file['messages'][0];
-    $this->assertEquals("Call to deprecated function upgrade_status_test_deprecated_function_call(). Deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use the replacement instead.", $message['message']);
+    $this->assertEquals("Call to deprecated function upgrade_status_test_contrib_error_function(). Deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use the replacement instead.", $message['message']);
     $this->assertEquals(13, $message['line']);

     $report = $key_value->get('upgrade_status_test_twig');
diff --git a/tests/src/Functional/UpgradeStatusTestBase.php b/tests/src/Functional/UpgradeStatusTestBase.php
index 1976f2c..cd82d08 100644
--- a/tests/src/Functional/UpgradeStatusTestBase.php
+++ b/tests/src/Functional/UpgradeStatusTestBase.php
@@ -19,7 +19,6 @@ abstract class UpgradeStatusTestBase extends BrowserTestBase {
    */
   protected static $modules = [
     'upgrade_status',
-    'upgrade_status_test_deprecated_function',
     'upgrade_status_test_error',
     'upgrade_status_test_no_error',
     'upgrade_status_test_submodules_a',
@@ -46,7 +45,6 @@ abstract class UpgradeStatusTestBase extends BrowserTestBase {
    */
   protected function runFullScan() {
     $edit = [
-      'scan[data][list][upgrade_status_test_deprecated_function]' => TRUE,
       'scan[data][list][upgrade_status_test_error]' => TRUE,
       'scan[data][list][upgrade_status_test_no_error]' => TRUE,
       'scan[data][list][upgrade_status_test_submodules]' => TRUE,