diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5791a289..d29537b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
 - Client factories for Buzz.
 
 
+### Fixed
+
+- Puli autoload issue on >=PHP 5.6, see [puli/issues#190](https://github.com/puli/issues/issues/190)
+
+
 ## 1.0.0 - 2016-03-04
 
 ### Added
diff --git a/Tests/autoload.php b/Tests/autoload.php
new file mode 100644
index 00000000..96959c78
--- /dev/null
+++ b/Tests/autoload.php
@@ -0,0 +1,10 @@
+<?php
+
+$loader = require __DIR__.'/../vendor/autoload.php';
+
+// Temporary fix for Puli
+if (PHP_VERSION_ID >= 50600) {
+    $loader->addClassMap([
+        'Puli\\GeneratedPuliFactory' => __DIR__.'/../.puli/GeneratedPuliFactory.php',
+    ]);
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b548381d..ca9b6a9c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./vendor/autoload.php"
+<phpunit bootstrap="./Tests/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"