diff --git a/.travis.sh b/.travis.sh
index 41a6742..0a9365d 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -7,4 +7,5 @@ composer install --ignore-platform-reqs
 hh_client
 
 hhvm vendor/bin/hacktest tests/
-hhvm vendor/bin/hhast-lint
+# Circular dependency that needs updating
+# hhvm vendor/bin/hhast-lint
diff --git a/composer.json b/composer.json
index c02ac17..d535cf4 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "hhvm/hsl-experimental": "^3.29"
   },
   "require-dev": {
-    "hhvm/hhast": "^3.29",
+    "hhvm/hhast": "dev-master",
     "facebook/fbexpect": "^2.1.0",
     "hhvm/hacktest": "^1.0.0"
   }
diff --git a/composer.lock b/composer.lock
index 11f0c27..e443f80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "86c8bb0f7da57f8cce5588dd00fcdacc",
+    "content-hash": "e9b6a6d95ffacbd56a706bd9de1d80c3",
     "packages": [
         {
             "name": "hhvm/hhvm-autoload",
@@ -269,34 +269,35 @@
         },
         {
             "name": "hhvm/hhast",
-            "version": "v3.29.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hhvm/hhast.git",
-                "reference": "0557ba2579a56f443bd573a1ce90908e282be9fd"
+                "reference": "92c989a956dec5df687a72e7376ff9f19531e3f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hhast/zipball/0557ba2579a56f443bd573a1ce90908e282be9fd",
-                "reference": "0557ba2579a56f443bd573a1ce90908e282be9fd",
+                "url": "https://api.github.com/repos/hhvm/hhast/zipball/92c989a956dec5df687a72e7376ff9f19531e3f5",
+                "reference": "92c989a956dec5df687a72e7376ff9f19531e3f5",
                 "shasum": ""
             },
             "require": {
                 "facebook/difflib": "^1.0.0",
-                "facebook/hh-clilib": "^1.1.1",
+                "facebook/hh-clilib": "dev-master",
                 "hhvm": "3.29.*",
                 "hhvm/hsl": "^1.0.0|^3.26.0",
                 "hhvm/type-assert": "^3.1"
             },
             "require-dev": {
                 "facebook/fbexpect": "^2.1.1",
-                "facebook/hack-codegen": "~3.2.1",
+                "facebook/hack-codegen": "^4.0",
                 "hhvm/hacktest": "^1.0",
                 "hhvm/hhvm-autoload": "^1.5"
             },
             "bin": [
                 "bin/hhast-lint",
-                "bin/hhast-inspect"
+                "bin/hhast-inspect",
+                "bin/hhast-migrate"
             ],
             "type": "library",
             "extra": {
@@ -308,12 +309,14 @@
             "license": [
                 "MIT"
             ],
-            "time": "2018-10-18T22:07:15+00:00"
+            "time": "2018-11-29T19:19:05+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "hhvm/hhast": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
diff --git a/src/TestLib/StringInput.hh b/src/TestLib/StringInput.hh
index ed7679d..3f1054a 100644
--- a/src/TestLib/StringInput.hh
+++ b/src/TestLib/StringInput.hh
@@ -10,7 +10,6 @@
 
 namespace Facebook\CLILib\TestLib;
 
-use type Facebook\CLILib\InputInterface;
 use namespace HH\Lib\{Math, Str};
 use namespace HH\Lib\Experimental\IO;
 
diff --git a/src/TestLib/StringOutput.hh b/src/TestLib/StringOutput.hh
index 2a31d72..f7ce253 100644
--- a/src/TestLib/StringOutput.hh
+++ b/src/TestLib/StringOutput.hh
@@ -10,7 +10,6 @@
 
 namespace Facebook\CLILib\TestLib;
 
-use type Facebook\CLILib\OutputInterface;
 
 use namespace HH\Lib\Str;
 use namespace HH\Lib\Experimental\IO;