diff --git a/.travis.yml b/.travis.yml
index 7f4a5c28..24d89a27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,18 @@ sudo: false
 language: go
 
 go:
- - 1.5
+ - 1.6
 
 script:
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
   - go get github.com/kisielk/errcheck
-  - go test -v ./...
+  - go get -u github.com/FiloSottile/gvt
+  - gvt restore
+  - go test -v $(go list ./... | grep -v vendor/)
   - go test -v ./test -indexType=firestorm
-  - go vet ./...
-  - errcheck ./...
+  - go vet $(go list ./... | grep -v vendor/)
+  - errcheck $(go list ./... | grep -v vendor/)
   - docs/project-code-coverage.sh
   - docs/build_children.sh
 
diff --git a/docs/project-code-coverage.sh b/docs/project-code-coverage.sh
index c0c4c255..1fce9e90 100755
--- a/docs/project-code-coverage.sh
+++ b/docs/project-code-coverage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "mode: count" > acc.out
-for Dir in . $(find ./* -maxdepth 10 -type d ); 
+for Dir in . $(find ./* -maxdepth 10 -type d | grep -v vendor);
 do
 	if ls $Dir/*.go &> /dev/null;
 	then
@@ -11,23 +11,23 @@ do
 		then
     		if [ -f profile.out ]
     		then
-        		cat profile.out | grep -v "mode: count" >> acc.out 
+        		cat profile.out | grep -v "mode: count" >> acc.out
     		fi
     	else
     		exit 1
-    	fi	
+    	fi
     fi
 done
 
 # collect integration test coverage
 echo "mode: count" > integration-acc.out
-INTPACKS=`go list ./... | grep -v utils | xargs | sed 's/ /,/g'`
+INTPACKS=`go list ./... | grep -v vendor | grep -v utils | xargs | sed 's/ /,/g'`
 returnval=`go test -coverpkg=$INTPACKS -coverprofile=profile.out -covermode=count ./test`
 if [[ ${returnval} != *FAIL* ]]
 then
     if [ -f profile.out ]
     then
-        cat profile.out | grep -v "mode: count" >> integration-acc.out 
+        cat profile.out | grep -v "mode: count" >> integration-acc.out
     fi
 else
     exit 1
@@ -44,9 +44,9 @@ fi
 if [ -n "$COVERHTML" ]
 then
     go tool cover -html=merged.out
-fi	
+fi
 
 rm -rf ./profile.out
 rm -rf ./acc.out
 rm -rf ./integration-acc.out
-rm -rf ./merged.out
\ No newline at end of file
+rm -rf ./merged.out