diff --git a/.drone.yml b/.drone.yml
index 3371f724..80d298f2 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,10 +1,9 @@
 image: dockercore/libcontainer
-env:
-  - AUTO_GOPATH=1
 script:
 # Setup the DockerInDocker environment.
   - /dind
   - sed -i 's!docker/docker!docker/libcontainer!' /go/src/github.com/docker/docker/hack/make/.validate
   - bash /go/src/github.com/docker/docker/hack/make/validate-dco
   - bash /go/src/github.com/docker/docker/hack/make/validate-gofmt
+  - export GOPATH="$GOPATH:/go:$(pwd)/vendor" # Drone mucks with our GOPATH
   - make direct-test