diff --git a/composer.json b/composer.json
index b24396a7..3a2247db 100644
--- a/composer.json
+++ b/composer.json
@@ -31,8 +31,8 @@
         "ext-soap": "*"
     },
     "autoload": {
-        "files": [
-            "PHPUnit/Framework/MockObject/Autoload.php"
+        "classmap": [
+            "PHPUnit/"
         ]
     },
     "include-path": [
diff --git a/package-composer.json b/package-composer.json
index 7274dc3e..bff1cf45 100644
--- a/package-composer.json
+++ b/package-composer.json
@@ -11,9 +11,9 @@
         "irc": "irc://irc.freenode.net/phpunit"
     },
     "autoload": {
-        "files": [ "PHPUnit/Framework/MockObject/Autoload.php" ]
+        "classmap": [ "PHPUnit/" ]
     },
     "include_path": [
         ""
     ]
-}
\ No newline at end of file
+}