diff --git a/scaffold/phpunit-testtraits.xml b/scaffold/phpunit-testtraits.xml
index 88716b56..20251302 100644
--- a/scaffold/phpunit-testtraits.xml
+++ b/scaffold/phpunit-testtraits.xml
@@ -58,28 +58,46 @@
- ../../../../web/modules/custom/**/tests/src/Unit
- ../../../../web/themes/custom/**/tests/src/Unit
- ../../../../web/profiles/custom/**/tests/src/Unit
+ ../../../../web/modules/custom/*/tests/src/Unit
+ ../../../../web/modules/custom/*/*/tests/src/Unit
+ ../../../../web/modules/custom/*/modules/*/tests/src/Unit
+ ../../../../web/themes/custom/*/tests/src/Unit
+ ../../../../web/themes/custom/*/*/tests/src/Unit
+ ../../../../web/profiles/custom/*/tests/src/Unit
+ ../../../../web/profiles/custom/*/*/tests/src/Unit
../../../../test/phpunit/*/Unit
- ../../../../web/modules/custom/**/tests/src/Kernel
- ../../../../web/themes/custom/**/tests/src/Kernel
- ../../../../web/profiles/custom/**/tests/src/Kernel
+ ../../../../web/modules/custom/*/tests/src/Kernel
+ ../../../../web/modules/custom/*/*/tests/src/Kernel
+ ../../../../web/modules/custom/*/modules/*/tests/src/Kernel
../../../../test/phpunit/*/Kernel
- ../../../../web/modules/custom/**/tests/src/Functional
- ../../../../web/themes/custom/**/tests/src/Functional
- ../../../../web/profiles/custom/**/tests/src/Functional
+ ../../../../web/modules/custom/*/tests/src/Functional
+ ../../../../web/modules/custom/*/*/tests/src/Functional
+ ../../../../web/modules/custom/*/modules/*/tests/src/Functional
../../../../test/phpunit/*/Functional
- ../../../../web/modules/custom/**/tests/src/FunctionalJavaScript
- ../../../../web/themes/custom/**/tests/src/FunctionalJavaScript
- ../../../../web/profiles/custom/**/tests/src/FunctionalJavaScript
+ ../../../../web/modules/custom/*/tests/src/FunctionalJavaScript
+ ../../../../web/modules/custom/*/*/tests/src/FunctionalJavaScript
+ ../../../../web/modules/custom/*/modules/*/tests/src/FunctionalJavaScript
../../../../test/phpunit/*/FunctionalJavaScript
+
+
+ ../../../../web/modules/custom/*/tests/src/ExistingSite
+ ../../../../test/phpunit/*/ExistingSite
+ ../../../../web/modules/custom/*/modules/*/tests/src/ExistingSite
+ ../../../../test/phpunit/*/ExistingSite
+
+
+
+ ../../../../web/modules/custom/*/tests/src/ExistingSiteJavascript
+ ../../../../test/phpunit/*/ExistingSiteJavascript
+ ../../../../web/modules/custom/*/modules/*/tests/src/ExistingSiteJavaScript
+ ../../../../test/phpunit/*/ExistingSiteJavaScript
+
diff --git a/scaffold/phpunit.xml b/scaffold/phpunit.xml
index 590e84df..da44e35c 100644
--- a/scaffold/phpunit.xml
+++ b/scaffold/phpunit.xml
@@ -55,27 +55,28 @@
- ../../../../web/modules/custom/**/tests/src/Unit
- ../../../../web/themes/custom/**/tests/src/Unit
- ../../../../web/profiles/custom/**/tests/src/Unit
+
+ ../../../../web/modules/custom/*/tests/src/Unit
+ ../../../../web/modules/custom/*/*/tests/src/Unit
+ ../../../../web/modules/custom/*/modules/*/tests/src/Unit
../../../../test/phpunit/*/Unit
- ../../../../web/modules/custom/**/tests/src/Kernel
- ../../../../web/themes/custom/**/tests/src/Kernel
- ../../../../web/profiles/custom/**/tests/src/Kernel
+ ../../../../web/modules/custom/*/tests/src/Kernel
+ ../../../../web/modules/custom/*/*/tests/src/Kernel
+ ../../../../web/modules/custom/*/modules/*/tests/src/Kernel
../../../../test/phpunit/*/Kernel
- ../../../../web/modules/custom/**/tests/src/Functional
- ../../../../web/themes/custom/**/tests/src/Functional
- ../../../../web/profiles/custom/**/tests/src/Functional
+ ../../../../web/modules/custom/*/tests/src/Functional
+ ../../../../web/modules/custom/*/*/tests/src/Functional
+ ../../../../web/modules/custom/*/modules/*/tests/src/Functional
../../../../test/phpunit/*/Functional
- ../../../../web/modules/custom/**/tests/src/FunctionalJavaScript
- ../../../../web/themes/custom/**/tests/src/FunctionalJavaScript
- ../../../../web/profiles/custom/**/tests/src/FunctionalJavaScript
+ ../../../../web/modules/custom/*/tests/src/FunctionalJavaScript
+ ../../../../web/modules/custom/*/*/tests/src/FunctionalJavaScript
+ ../../../../web/modules/custom/*/modules/*/tests/src/FunctionalJavaScript
../../../../test/phpunit/*/FunctionalJavaScript