diff --git a/.drone.yml b/.drone.yml
index d76fff9f99..53e00e0fda 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,15 +1,14 @@
 image: dockercore/docker
 env:
-  - GOPATH=/var/cache/drone:$DRONE_BUILD_DIR/vendor
+  - AUTO_GOPATH=1
   - DOCKER_GRAPHDRIVER=vfs
   - DOCKER_EXECDRIVER=native
 script:
-# Setup the go environment.
-  - mkdir -p /var/cache/drone/src/github.com/docker
-  - ln -s $DRONE_BUILD_DIR /var/cache/drone/src/github.com/docker
 # Setup the DockerInDocker environment.
   - hack/dind
+# Tests relying on StartWithBusybox make Drone time out.
+  - rm integration-cli/docker_cli_daemon_test.go
+  - rm integration-cli/docker_cli_exec_test.go 
 # Validate and test.
   - hack/make.sh validate-dco validate-gofmt
-  - rm integration-cli/docker_cli_daemon_test.go  #FIXME: This test currently fails inside drone.
   - hack/make.sh binary cross test-unit test-integration-cli test-integration