diff --git a/.travis.yml b/.travis.yml
index 62719984..4f9d1b94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq postfix
 install:
-  - composer install
+  - composer update
 before_script:
   - sudo service postfix stop
   - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
@@ -27,7 +27,7 @@ before_script:
   - sudo cp fakesendmail.sh /usr/sbin/sendmail
   - echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > $(php --ini|grep -m 1 "ini files in:"|cut -d ":" -f 2)/sendmail.ini
 script:
-  - phpunit --configuration ../travis.phpunit.xml.dist
+  - phpunit --configuration ../travis.phpunit.xml.dist --bootstrap tests/bootstrap.php
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover ../build/logs/clover.xml
diff --git a/test/bootstrap.php b/test/bootstrap.php
new file mode 100644
index 00000000..6209ed15
--- /dev/null
+++ b/test/bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * PHPUnit bootstrap file
+ */
+require_once '../vendor/autoload.php';
+spl_autoload_register(
+    function ($class) {
+        require_once strtr($class, '\\_', '//') . '.php';
+    }
+);
diff --git a/test/phpmailerTest.php b/test/phpmailerTest.php
index c32704f1..004790bb 100644
--- a/test/phpmailerTest.php
+++ b/test/phpmailerTest.php
@@ -13,8 +13,6 @@
 
 namespace PHPMailer\PHPMailer;
 
-require '../vendor/autoload.php';
-
 /**
  * PHPMailer - PHP email transport unit test class.
  */
diff --git a/travis.phpunit.xml.dist b/travis.phpunit.xml.dist
index 8edfd44e..988156ef 100644
--- a/travis.phpunit.xml.dist
+++ b/travis.phpunit.xml.dist
@@ -16,11 +16,6 @@
             <directory>./test/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <blacklist>
-            <directory suffix=".php">./extras</directory>
-        </blacklist>
-    </filter>
     <groups>
         <exclude>
             <group>languages</group>