diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index bfa142b..595eac9 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -15,7 +15,7 @@
     <testsuite name="unit">
       <directory>./tests/Drupal/Tests</directory>
       <directory>./modules/*/tests/src/Unit</directory>
-      <!-- Allow for discovery of modules in sub-directories in the top-level
+      <!-- Allow for discovery of tests in sub-directories in the top-level
            modules/ directory. -->
       <directory>../modules</directory>
       <directory>../profiles/*/tests/src/Unit</directory>
@@ -32,7 +32,9 @@
     <testsuite name="kernel">
       <directory>./tests/Drupal/KernelTests</directory>
       <directory>./modules/*/tests/src/Kernel</directory>
-      <directory>../modules/*/tests/src/Kernel</directory>
+      <!-- Allow for discovery of tests in sub-directories in the top-level
+           modules/ directory. -->
+      <directory>../modules</directory>
       <directory>../profiles/*/tests/src/Kernel</directory>
       <directory>../sites/*/modules/*/tests/src/Kernel</directory>
       <!-- Exclude Composer's vendor directory so we don't run tests there. -->
@@ -43,7 +45,9 @@
     <testsuite name="functional">
       <directory>./tests/Drupal/FunctionalTests</directory>
       <directory>./modules/*/tests/src/Functional</directory>
-      <directory>../modules/*/tests/src/Functional</directory>
+      <!-- Allow for discovery of tests in sub-directories in the top-level
+           modules/ directory. -->
+      <directory>../modules</directory>
       <directory>../profiles/*/tests/src/Functional</directory>
       <directory>../sites/*/modules/*/tests/src/Functional</directory>
       <!-- Exclude Composer's vendor directory so we don't run tests there. -->