diff --git a/hack/make.sh b/hack/make.sh
index e3ce1cc1d..c7318953b 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -220,6 +220,7 @@ test_env() {
 		DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \
 		DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \
 		DOCKER_HOST="$DOCKER_HOST" \
+		DOCKER_REMAP_ROOT="$DOCKER_REMAP_ROOT" \
 		DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \
 		GOPATH="$GOPATH" \
 		HOME="$ABS_DEST/fake-HOME" \
diff --git a/integration-cli/requirements.go b/integration-cli/requirements.go
index 4ae4f0fd1..7248bc679 100644
--- a/integration-cli/requirements.go
+++ b/integration-cli/requirements.go
@@ -152,9 +152,9 @@ var (
 		func() bool {
 			root := os.Getenv("DOCKER_REMAP_ROOT")
 			if root != "" {
-				return true
+				return false
 			}
-			return false
+			return true
 		},
 		"Test cannot be run when remapping root",
 	}