diff --git a/hack/make/dynbinary b/hack/make/dynbinary
index 96ce482674..100c00eed5 100644
--- a/hack/make/dynbinary
+++ b/hack/make/dynbinary
@@ -11,5 +11,7 @@ ln -sf dockerinit-$VERSION $DEST/dockerinit
 export DOCKER_INITSHA1="$(sha1sum $DEST/dockerinit-$VERSION | cut -d' ' -f1)"
 # exported so that "dyntest" can easily access it later without recalculating it
 
-go build -o $DEST/docker-$VERSION -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS ./docker
-echo "Created binary: $DEST/docker-$VERSION"
+(
+	export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\""
+	source "$(dirname "$BASH_SOURCE")/binary"
+)
diff --git a/hack/make/dyntest b/hack/make/dyntest
index cea3ba4e06..eb5c2b73ed 100644
--- a/hack/make/dyntest
+++ b/hack/make/dyntest
@@ -10,7 +10,8 @@ if [ ! -x "$INIT" ]; then
 	false
 fi
 
-export TEST_DOCKERINIT_PATH="$INIT"
-
-LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" \
+(
+	export TEST_DOCKERINIT_PATH="$INIT"
+	export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\""
 	source "$(dirname "$BASH_SOURCE")/test"
+)