diff --git a/composer.json b/composer.json
index 7792440..4856aa5 100644
--- a/composer.json
+++ b/composer.json
@@ -39,13 +39,13 @@
         "sabre/uri": "^2.0",
         "jetbrains/phpstorm-stubs": "dev-master",
         "composer/composer": "^1.3",
-        "Microsoft/tolerant-php-parser": "master"
+        "Microsoft/tolerant-php-parser": "dev-lang-server"
     },
     "minimum-stability": "dev",
     "repositories": [
         {
             "type": "git",
-            "url": "https://github.com/Microsoft/tolerant-php-parser.git"
+            "url": "https://github.com/mousetraps/tolerant-php-parser.git"
         }
     ],
     "prefer-stable": true,