diff --git a/.travis.yml b/.travis.yml
index 3d572ae5..9ced8226 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.4
   - 5.5
+  - 5.6
   - hhvm
 
 matrix:
@@ -18,4 +19,4 @@ script: phpunit --configuration phpunit.xml.dist
 
 cache:
   directories:
-    - vendor
\ No newline at end of file
+    - vendor
diff --git a/composer.json b/composer.json
index d8498d59..f8f0d54a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,12 +9,12 @@
 	},
 	"require-dev": {
 		"league/phpunit-coverage-listener": "~1.0",
-        "mockery/mockery": "0.8"
+        	"mockery/mockery": "0.8"
 	},
 	"repositories": [
 		{
 			"type": "git",
-			"url": "https://github.com/php-loep/oauth2-server.git"
+			"url": "https://github.com/thephpleague/oauth2-server.git"
 		}
 	],
 	"keywords": [
@@ -52,4 +52,4 @@
 	"suggest": {
 
 	}
-}
\ No newline at end of file
+}