diff -up ./phpunit.rpm ./phpunit
--- ./phpunit.rpm	2017-02-05 16:31:31.000000000 +0100
+++ ./phpunit	2017-02-07 11:56:09.174850687 +0100
@@ -27,26 +27,27 @@ if (!ini_get('date.timezone')) {
     ini_set('date.timezone', 'UTC');
 }
 
-foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
-    if (file_exists($file)) {
-        define('PHPUNIT_COMPOSER_INSTALL', $file);
-
-        break;
-    }
+// Ensure correct include_path for RHSCL
+$inc = get_include_path();
+$dirs = explode(':', $inc);
+if (!in_array('/usr/share/php', $dirs)) {
+    $dirs[] = '/usr/share/php';
+    set_include_path(implode(':', $dirs));
 }
+unset ($inc, $dirs);
 
-unset($file);
-
-if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
-    fwrite(STDERR,
-        'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL .
-        '    composer install' . PHP_EOL . PHP_EOL .
-        'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL
-    );
-
-    die(1);
+// Libraries PATH
+if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) {
+    echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n";
+    define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php'));
+} else {
+    define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php'));
 }
 
 require PHPUNIT_COMPOSER_INSTALL;
 
-PHPUnit_TextUI_Command::main();
+if (class_exists('PHPUnit_TextUI_Command')) {
+    PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
+} else {
+    PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
+}
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm	2017-02-05 16:31:31.000000000 +0100
+++ ./tests/bootstrap.php	2017-02-07 11:49:35.123108015 +0100
@@ -1,6 +1,9 @@
 <?php
 // Needed for isolated tests
-require __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/_files/CoveredFunction.php';
+require_once __DIR__ . '/../PHPUnit/Framework/Assert/Functions.php';
+require_once __DIR__ . '/../PHPUnit/Autoload.php';
+require_once __DIR__ . '/autoload.php';
 
 ini_set('precision', 14);
 ini_set('serialize_precision', 14);