Merge pull request #2577 from johanneswuerbach/godep-tests

ref(*): Manage test dependencies using godeps

Author: mboersma

Makefile

@@ -72,4 +72,4 @@ test-unit: setup-venv test-style
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
 	@docker history deis/test-postgresql >/dev/null 2>&1 || docker pull deis/test-postgresql:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...