diff --git a/.travis.yml b/.travis.yml
index 405baa53..7277bab7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,21 @@ go:
 services:
   - docker
 
+env:
+  - BBLFSHD_VERSION=v2.6.1
+
 before_script:
   - curl -L https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 > $GOPATH/bin/dep
   - chmod +x $GOPATH/bin/dep
   - dep ensure --vendor-only
   - go get ./vendor/gopkg.in/bblfsh/sdk.v2/cmd/...
   - go install ./vendor/gopkg.in/bblfsh/sdk.v2/cmd/...
-  - docker pull bblfsh/bblfshd
+  - docker pull bblfsh/bblfshd:$BBLFSHD_VERSION
 
 script:
   - bblfsh-sdk update --dry-run
   - bblfsh-sdk build ci-build
-  - bblfsh-sdk test ci-build
+  - bblfsh-sdk test --bblfshd $BBLFSHD_VERSION ci-build
 
 after_success:
   - bblfsh-sdk push ci-build
diff --git a/Gopkg.lock b/Gopkg.lock
index 771868af..c722461a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -166,8 +166,8 @@
 [[projects]]
   name = "github.com/sirupsen/logrus"
   packages = ["."]
-  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
-  version = "v1.0.5"
+  revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
+  version = "v1.0.6"
 
 [[projects]]
   name = "github.com/stretchr/testify"
@@ -188,7 +188,7 @@
   branch = "master"
   name = "golang.org/x/crypto"
   packages = ["ssh/terminal"]
-  revision = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"
+  revision = "de0752318171da717af4ce24d0a2e8626afaeb11"
 
 [[projects]]
   branch = "master"
@@ -202,7 +202,7 @@
     "internal/timeseries",
     "trace"
   ]
-  revision = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"
+  revision = "f9ce57c11b242f0f1599cf25c89d8cb02c45295a"
 
 [[projects]]
   branch = "master"
@@ -211,7 +211,7 @@
     "unix",
     "windows"
   ]
-  revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
+  revision = "904bdc257025c7b3f43c19360ad3ab85783fad78"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -238,7 +238,7 @@
   branch = "master"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
-  revision = "fedd2861243fd1a8152376292b921b394c7bef7e"
+  revision = "383e8b2c3b9e36c4076b235b32537292176bae20"
 
 [[projects]]
   name = "google.golang.org/grpc"
@@ -256,7 +256,9 @@
     "internal",
     "internal/backoff",
     "internal/channelz",
+    "internal/envconfig",
     "internal/grpcrand",
+    "internal/transport",
     "keepalive",
     "metadata",
     "naming",
@@ -266,11 +268,10 @@
     "resolver/passthrough",
     "stats",
     "status",
-    "tap",
-    "transport"
+    "tap"
   ]
-  revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"
-  version = "v1.13.0"
+  revision = "32fb0ac620c32ba40a4626ddf94d90d12cce3455"
+  version = "v1.14.0"
 
 [[projects]]
   name = "gopkg.in/bblfsh/sdk.v1"
@@ -283,7 +284,6 @@
   version = "v1.16.1"
 
 [[projects]]
-  branch = "v2"
   name = "gopkg.in/bblfsh/sdk.v2"
   packages = [
     "driver",
@@ -305,7 +305,8 @@
     "uast/viewer",
     "uast/yaml"
   ]
-  revision = "d129d7e699d8cf18b8b07075090127e57b2be2a6"
+  revision = "7afaacbde549f1711442ee62a7a646a799653833"
+  version = "v2.0.1"
 
 [[projects]]
   name = "gopkg.in/src-d/go-errors.v1"
@@ -322,6 +323,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "3475e183627f94765a60f577e760b9bec3f1b21583f4a252999a5fca8b8fdb65"
+  inputs-digest = "fced730552e6e9832692b4eff3f5a186fae546aaa7b15df3c2ca110ad1c39bf8"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index be25f016..9247d825 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -2,7 +2,7 @@
 # for detailed Gopkg.toml documentation.
 
 [[constraint]]
-  branch = "v2"
+  version = "v2.0.1"
   name = "gopkg.in/bblfsh/sdk.v2"
 
 [prune]