diff --git a/.gitignore b/.gitignore
index 1745da5c..c9441c8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 coverage.out
 coverage.html
+vendor/
diff --git a/.travis.yml b/.travis.yml
index d2b67f69..2443f939 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,21 @@
 language: go
 
+before_install:
+  - curl -L -s https://github.com/golang/dep/releases/download/v0.3.1/dep-linux-amd64 -o $GOPATH/bin/dep
+  - chmod +x $GOPATH/bin/dep
+  # get test deps
+  - go get golang.org/x/sys/unix
+  - go get github.com/goji/param
+  - go get github.com/kr/pty
+
+install:
+  - dep ensure
+
+# starting with go 1.9, vendor is excluded and you can simply do: go test ./...
+script: go test $(go list ./... | grep -v /vendor/)
+
 go:
   - 1.7
   - 1.8
-  - tip
+  - 1.9
+  - tip
\ No newline at end of file
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 00000000..38a8fec3
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,53 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/beevik/etree"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/dchest/uniuri"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  version = "3.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/kr/pretty"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/russellhaering/goxmldsig"
+
+[[constraint]]
+  name = "github.com/zenazn/goji"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+
+[[constraint]]
+  branch = "v1"
+  name = "gopkg.in/check.v1"
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 00000000..76f5f67c
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,70 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/beevik/etree"
+  packages = ["."]
+  revision = "15a30b44cfd6c5a16a7ddfe271bf146aaf2d3195"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/dchest/uniuri"
+  packages = ["."]
+  revision = "8902c56451e9b58ff940bbe5fec35d5f9c04584a"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"
+  version = "v3.0.0"
+
+[[projects]]
+  name = "github.com/jonboulle/clockwork"
+  packages = ["."]
+  revision = "2eee05ed794112d45db504eb05aa693efd2b8b09"
+  version = "v0.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kr/pretty"
+  packages = ["."]
+  revision = "cfb55aafdaf3ec08f0db22699ab822c50091b1c4"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kr/text"
+  packages = ["."]
+  revision = "7cafcd837844e784b526369c9bce262804aebc60"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/russellhaering/goxmldsig"
+  packages = [".","etreeutils","types"]
+  revision = "b7efc6231e45b10bfd779852831c8bb59b350ec5"
+
+[[projects]]
+  name = "github.com/zenazn/goji"
+  packages = [".","bind","graceful","graceful/listener","web","web/middleware","web/mutil"]
+  revision = "64eb34159fe53473206c2b3e70fe396a639452f2"
+  version = "v1.0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["bcrypt","blowfish","ripemd160"]
+  revision = "847319b7fc94cab682988f93da778204da164588"
+
+[[projects]]
+  branch = "v1"
+  name = "gopkg.in/check.v1"
+  packages = ["."]
+  revision = "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "253ec289f823a19c6473233e4934b31f5e623b0fb3136183b129cb652a5685c2"
+  solver-name = "gps-cdcl"
+  solver-version = 1
+