diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index 6ca7e89..a5c24c9 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -5,12 +5,12 @@
     <testsuite name="Drupal Unit Test Suite">
       <directory>./tests/*</directory>
       <directory>./modules/*/tests/*</directory>
-      <directory>../modules/*/tests/*</directory>
-      <directory>../sites/*/modules/*/tests/*</directory>
-      <!-- Exclude files that end in Test.php that aren't actually phpunit tests. -->
-      <exclude>./modules/config/tests/config_test/lib/Drupal/config_test</exclude>
-      <exclude>./modules/views/tests/views_test_data/lib/Drupal/views_test_data</exclude>
+      <directory>../modules</directory>
+      <directory>../sites/*/modules</directory>
+      <!-- Exclude Composer's vendor directory -->
+      <exclude>./vendor</exclude>
+      <!-- Exclude Drush tests -->
+      <exclude>./drush/tests</exclude>
     </testsuite>
   </testsuites>
 </phpunit>
-