diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r6.ebuild
similarity index 97%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r6.ebuild
index e44e9cddb2..54bbf645ae 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r6.ebuild
@@ -188,6 +188,10 @@ src_compile() {
 		fi
 	done
 
+	# Docker uses the host files when testing, so force docker
+	# to not use dm_task_deferred_remove to cover cross builds.
+	DOCKER_BUILDTAGS+=' libdm_no_deferred_remove'
+
 	# https://github.com/docker/docker/pull/13338
 	if use experimental; then
 		export DOCKER_EXPERIMENTAL=1