diff --git a/composer.json b/composer.json
index 6cd984cc..8625812c 100644
--- a/composer.json
+++ b/composer.json
@@ -44,6 +44,9 @@
     "autoload": {
         "psr-4": {"Monolog\\": "src/Monolog"}
     },
+    "autoload-dev": {
+        "psr-4": {"Monolog\\": "tests/Monolog"}
+    },
     "provide": {
         "psr/log-implementation": "1.0.0"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 17545707..20d82b63 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="Monolog Test Suite">
             <directory>tests/Monolog/</directory>
@@ -12,4 +12,8 @@
             <directory suffix=".php">src/Monolog/</directory>
         </whitelist>
     </filter>
+
+    <php>
+        <ini name="date.timezone" value="UTC"/>
+    </php>
 </phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index b78740e2..00000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$loader = require __DIR__ . "/../vendor/autoload.php";
-$loader->addPsr4('Monolog\\', __DIR__.'/Monolog');
-
-date_default_timezone_set('UTC');