diff --git a/go-docker b/go-docker
index f22ddf56..84699a6a 100755
--- a/go-docker
+++ b/go-docker
@@ -17,5 +17,10 @@ for VAR in ${DOCKER_ENV//,/ }; do
     ENV_STR="$ENV_STR -e $VAR=${!VAR}"
 done
 
+LINKS_STR=""
+for VAR in ${DOCKER_LINKS//,/ }; do
+    LINKS_STR="$LINKS_STR --link $VAR"
+done
+
 echo "running with docker, might take a while to pull the image..."
-docker run $ENV_STR --rm --net=host -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/go-builder:1.3.3 $@
+docker run $LINKS_STR $ENV_STR --rm  -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/go-builder:1.3.3 $@
diff --git a/test-functional b/test-functional
index 92c8d8dd..42f3e0d3 100755
--- a/test-functional
+++ b/test-functional
@@ -1,4 +1,4 @@
 #!/bin/bash -e
-
 source ./build
 go test $@ github.com/coreos/dex/functional
+go test $@ github.com/coreos/dex/functional/repo