diff --git a/.gitignore b/.gitignore
index 6788dd3..791c838 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.test
 *.swp
+vendor
diff --git a/.travis.yml b/.travis.yml
index 4afb310..5af1b53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,12 @@
 language: go
 
 go:
-  - 1.1
-  - 1.2
-  - 1.3
-  - 1.4.2
-  - 1.4.3
-  - 1.5
-  - 1.5.1
+  - 1.5.4
+  - 1.6.3
 
 env:
+  global:
+    - GO15VENDOREXPERIMENT=1
   matrix:
     - ES_VERSION=1.0.3 GROOVY_VER=2.0.0
     - ES_VERSION=1.1.2 GROOVY_VER=2.0.0
@@ -27,9 +24,10 @@ before_script:
   - "echo 'script.groovy.sandbox.enabled: true' >> ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/config/elasticsearch.yml"
   - 'if [[ "${ES_VERSION}" < "1.3" ]]; then ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/bin/plugin --install elasticsearch/elasticsearch-lang-groovy/${GROOVY_VER}; fi'
   - ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/bin/elasticsearch >/dev/null &
+  - sleep 10 # Wait for ES to start up
 
 install:
-  - go get gopkg.in/check.v1
+  - go get github.com/Masterminds/glide
 
 script:
   - make test
diff --git a/Makefile b/Makefile
index bfcb413..4de8169 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 help:
 	@echo "Available targets:"
 	@echo "- test: run tests"
-	@echo "- installdependencies: installs dependencies declared in dependencies.txt"
+	@echo "- deps: installs dependencies with glide"
 
-installdependencies:
-	cat dependencies.txt | xargs go get
+deps:
+	glide up
 
-test: installdependencies
+test: deps
 	go test -i && go test
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..21728fd
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,6 @@
+hash: 7e39b5bd354c3f0770ca3a9d28a74a0523695d18effa1e540f006b325defcfe7
+updated: 2016-07-26T14:50:32.597335795-05:00
+imports: []
+testImports:
+- name: github.com/go-check/check
+  version: 4f90aeace3a26ad7021961c297b22c42160c7b25
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..1942ac4
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,5 @@
+package: github.com/OwnLocal/goes
+import: []
+testImport:
+- package: github.com/go-check/check
+  version: v1
diff --git a/goes_test.go b/goes_test.go
index 7866558..a69fcb1 100644
--- a/goes_test.go
+++ b/goes_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	. "gopkg.in/check.v1"
+	. "github.com/go-check/check"
 )
 
 var (