diff --git a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
index ebfea06abffcc0021807a616b21564bab9951e9d..8747d61d92f44378a9d986d21c46928c2f4279c9 100644
--- a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
+++ b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
@@ -4,7 +4,7 @@ namespace Drupal\Tests\automatic_updates_extensions\Functional;
 
 use Drupal\automatic_updates\Event\ReadinessCheckEvent;
 use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
-use Drupal\automatic_updates_test\StagedDatabaseUpdateValidator;
+use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\ValidationResult;
 use Drupal\package_manager_bypass\Committer;
diff --git a/tests/modules/automatic_updates_test/src/AutomaticUpdatesTestServiceProvider.php b/package_manager/tests/modules/package_manager_test_validation/src/PackageManagerTestValidationServiceProvider.php
similarity index 83%
rename from tests/modules/automatic_updates_test/src/AutomaticUpdatesTestServiceProvider.php
rename to package_manager/tests/modules/package_manager_test_validation/src/PackageManagerTestValidationServiceProvider.php
index 0d2691a94fcb312b363ab6250e00aef0a1c547ca..1d7d206296e4193558a71286e86662fdd85e9cb2 100644
--- a/tests/modules/automatic_updates_test/src/AutomaticUpdatesTestServiceProvider.php
+++ b/package_manager/tests/modules/package_manager_test_validation/src/PackageManagerTestValidationServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\automatic_updates_test;
+namespace Drupal\package_manager_test_validation;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderBase;
@@ -9,7 +9,7 @@ use Symfony\Component\DependencyInjection\Reference;
 /**
  * Modifies container services for testing.
  */
-class AutomaticUpdatesTestServiceProvider extends ServiceProviderBase {
+class PackageManagerTestValidationServiceProvider extends ServiceProviderBase {
 
   /**
    * {@inheritdoc}
diff --git a/tests/modules/automatic_updates_test/src/StagedDatabaseUpdateValidator.php b/package_manager/tests/modules/package_manager_test_validation/src/StagedDatabaseUpdateValidator.php
similarity index 96%
rename from tests/modules/automatic_updates_test/src/StagedDatabaseUpdateValidator.php
rename to package_manager/tests/modules/package_manager_test_validation/src/StagedDatabaseUpdateValidator.php
index d4725297070246438f055051a50ba02d375c077f..8ee4bc71b6d7955fecfbabb4a157252f62680f03 100644
--- a/tests/modules/automatic_updates_test/src/StagedDatabaseUpdateValidator.php
+++ b/package_manager/tests/modules/package_manager_test_validation/src/StagedDatabaseUpdateValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\automatic_updates_test;
+namespace Drupal\package_manager_test_validation;
 
 use Drupal\package_manager\Validator\StagedDBUpdateValidator as BaseValidator;
 use Drupal\Core\Extension\Extension;
diff --git a/tests/src/Functional/UpdaterFormTest.php b/tests/src/Functional/UpdaterFormTest.php
index 7bda05ee0dc77282685599f1d8bde1ad172e6b8b..1612591efd73964a3ab43e609dee9db533366d09 100644
--- a/tests/src/Functional/UpdaterFormTest.php
+++ b/tests/src/Functional/UpdaterFormTest.php
@@ -4,7 +4,7 @@ namespace Drupal\Tests\automatic_updates\Functional;
 
 use Drupal\automatic_updates\Event\ReadinessCheckEvent;
 use Drupal\automatic_updates_test\Datetime\TestTime;
-use Drupal\automatic_updates_test\StagedDatabaseUpdateValidator;
+use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;
 use Drupal\package_manager\Event\PostRequireEvent;
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\Event\PostApplyEvent;