diff --git a/composer.json b/composer.json
index 9b42f05a1..6414c966d 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,9 @@
         "psr-4": { "MongoDB\\": "src/" },
         "files": [ "src/functions.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "MongoDB\\Tests\\": "tests/" }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.3.x-dev"
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 464fc5839..fd711e007 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -9,5 +9,3 @@
 } else {
     throw new Exception('Can\'t find autoload.php. Did you install dependencies with Composer?');
 }
-
-$loader->addPsr4('MongoDB\\Tests\\', __DIR__);