diff --git a/composer.json b/composer.json
index f504e9fc18..2d270a4285 100644
--- a/composer.json
+++ b/composer.json
@@ -42,8 +42,7 @@
         "drush/drush": "^12@stable",
         "getdkan/mock-chain": "^1.3.7",
         "osteel/openapi-httpfoundation-testing": "<1.0",
-        "phpunit/phpunit": "^8.5.14 || ^9",
-        "weitzman/drupal-test-traits": "^2.0.1"
+        "phpunit/phpunit": "^9.6"
     },
     "repositories": {
         "drupal": {
diff --git a/modules/common/tests/src/Traits/CleanUp.php b/modules/common/tests/src/Traits/CleanUp.php
index e485e8536c..7e6b16c6ae 100644
--- a/modules/common/tests/src/Traits/CleanUp.php
+++ b/modules/common/tests/src/Traits/CleanUp.php
@@ -6,7 +6,7 @@
 use FileFetcher\FileFetcher;
 
 /**
- *
+ * @deprecated Will be removed in a future version of DKAN.
  */
 trait CleanUp {
 
diff --git a/modules/datastore/tests/src/Functional/DictionaryEnforcerTest.php b/modules/datastore/tests/src/Functional/DictionaryEnforcerTest.php
index 7df13b7aad..37760acf17 100644
--- a/modules/datastore/tests/src/Functional/DictionaryEnforcerTest.php
+++ b/modules/datastore/tests/src/Functional/DictionaryEnforcerTest.php
@@ -25,7 +25,7 @@
  */
 class DictionaryEnforcerTest extends BrowserTestBase {
 
-  use GetDataTrait, CleanUp, QueueRunnerTrait;
+  use GetDataTrait, QueueRunnerTrait;
 
   protected $defaultTheme = 'stark';
 
diff --git a/modules/datastore/tests/src/Functional/Service/ResourcePurgerTest.php b/modules/datastore/tests/src/Functional/Service/ResourcePurgerTest.php
index 0c2eabe50c..26fb19cc52 100644
--- a/modules/datastore/tests/src/Functional/Service/ResourcePurgerTest.php
+++ b/modules/datastore/tests/src/Functional/Service/ResourcePurgerTest.php
@@ -20,7 +20,6 @@
  */
 class ResourcePurgerTest extends BrowserTestBase {
   use GetDataTrait;
-  use CleanUp;
   use QueueRunnerTrait;
 
   protected static $modules = [
diff --git a/phpunit.xml b/phpunit.xml
index 13dca2b74f..170850e1e4 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-  bootstrap="/var/www/html/vendor/weitzman/drupal-test-traits/src/bootstrap.php"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
   colors="true"
   verbose="true">
   <coverage>