diff --git a/.travis.yml b/.travis.yml
index d6b864cc0..6343ee738 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
 
 before_script:
   - travis_retry composer self-update
diff --git a/composer.json b/composer.json
index 3c29600a4..786bef04f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,43 @@
-{
-	"name": "m4tthumphrey/php-gitlab-api",
-	"type": "library",
-	"description": "GitLab API client",
-	"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
-	"keywords": ["gitlab", "api"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Matt Humphrey",
-			"homepage": "http://m4tt.io"
-		},
-		{
-			"name": "KnpLabs Team",
-			"homepage": "http://knplabs.com"
-		},
-		{
-			"name": "Thibault Duplessis",
-			"email": "thibault.duplessis@gmail.com",
-			"homepage": "http://ornicar.github.com"
-		}
-	],
-	"require": {
-		"php":                ">=5.3.2",
-		"ext-curl":           "*",
-		"ext-xml":            "*",
-		"kriswallsmith/buzz": ">=0.7"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "~4.5"
-	},
-	"autoload": {
-		"psr-0": { "Gitlab\\": "lib/" }
-	}
-}
+{
+	"name": "m4tthumphrey/php-gitlab-api",
+	"type": "library",
+	"description": "GitLab API client",
+	"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
+	"keywords": ["gitlab", "api"],
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Matt Humphrey",
+			"homepage": "http://m4tt.io"
+		},
+		{
+			"name": "KnpLabs Team",
+			"homepage": "http://knplabs.com"
+		},
+		{
+			"name": "Thibault Duplessis",
+			"email": "thibault.duplessis@gmail.com",
+			"homepage": "http://ornicar.github.com"
+		}
+	],
+	"require": {
+		"php": "^5.6 || ^7.0",
+		"ext-curl": "*",
+		"ext-xml": "*",
+		"kriswallsmith/buzz": ">=0.7"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "~4.5"
+	},
+	"autoload": {
+		"psr-4": { "Gitlab\\": "lib/Gitlab/" }
+	},
+	"autoload-dev": {
+		"psr-4": { "Gitlab\\Tests\\": "test/Gitlab/Tests/" }
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "9.0.x-dev"
+		}
+	}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e01386f15..7351de836 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
 				 processIsolation="false"
 				 stopOnFailure="false"
 				 syntaxCheck="false"
-				 bootstrap="test/bootstrap.php"
+				 bootstrap="vendor/autoload.php"
 	>
 	<testsuites>
 		<testsuite name="php-gitlab-api Test Suite">
@@ -22,4 +22,4 @@
 			<directory suffix=".php">./lib/Gitlab/</directory>
 		</whitelist>
 	</filter>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/test/bootstrap.php b/test/bootstrap.php
deleted file mode 100644
index 83bc8b088..000000000
--- a/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-function includeIfExists($file)
-{
-    if (file_exists($file)) {
-        return include $file;
-    }
-}
-
-if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../../../.composer/autoload.php'))) {
-    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
-        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
-        'php composer.phar install'.PHP_EOL);
-}
-
-$loader->add('Gitlab\Tests', __DIR__);
-
-return $loader;
\ No newline at end of file