diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 3177bf201b..18b762bff5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,7 +15,7 @@
 
     <testsuites>
         <testsuite name="Classes">
-            <directory suffix="_test.php">test/classes</directory>
+            <directory suffix="Test.php">test/classes</directory>
         </testsuite>
         <testsuite name="Engines">
             <directory suffix="_test.php">test/engines</directory>
diff --git a/phpunit.xml.hhvm b/phpunit.xml.hhvm
index 7ae549d631..7ae089b830 100644
--- a/phpunit.xml.hhvm
+++ b/phpunit.xml.hhvm
@@ -10,7 +10,7 @@
 
     <testsuites>
         <testsuite name="Classes">
-            <directory suffix="_test.php">test/classes</directory>
+            <directory suffix="Test.php">test/classes</directory>
         </testsuite>
         <testsuite name="Engines">
             <directory suffix="_test.php">test/engines</directory>
diff --git a/phpunit.xml.nocoverage b/phpunit.xml.nocoverage
index 3a2234735d..1683df5b69 100644
--- a/phpunit.xml.nocoverage
+++ b/phpunit.xml.nocoverage
@@ -17,7 +17,7 @@
 
     <testsuites>
         <testsuite name="Classes">
-            <directory suffix="_test.php">test/classes</directory>
+            <directory suffix="Test.php">test/classes</directory>
         </testsuite>
         <testsuite name="Engines">
             <directory suffix="_test.php">test/engines</directory>