diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index ceaf742694..296291c846 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -68,7 +68,8 @@ Type=notify
 
 # DOCKER_RAMDISK disables pivot_root in Docker, using MS_MOVE instead.
 Environment=DOCKER_RAMDISK=yes
-
+{{range .EngineOptions.Env}}Environment={{.}}
+{{end}}
 ExecStart=/usr/bin/docker daemon -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }}
 ExecReload=/bin/kill -s HUP $MAINPID
 
diff --git a/test/integration/docker_env_test.go b/test/integration/docker_env_test.go
index f98a35c6e8..ed637f25b6 100644
--- a/test/integration/docker_env_test.go
+++ b/test/integration/docker_env_test.go
@@ -38,10 +38,17 @@ func TestDockerEnv(t *testing.T) {
 	minikubeRunner.RunCommand(startCmd, true)
 	minikubeRunner.EnsureRunning()
 
-	profileContents := minikubeRunner.RunCommand("ssh cat /var/lib/boot2docker/profile", true)
+	filename := "/var/lib/boot2docker/profile"
+	// Figure out if it's b2d or buildroot
+	osContents := minikubeRunner.RunCommand("ssh cat /etc/os-release", true)
+	if strings.Contains(osContents, "Name=Buildroot") {
+		filename = "/etc/systemd/system/docker.service"
+	}
+
+	profileContents := minikubeRunner.RunCommand(fmt.Sprintf("ssh sudo cat %s", filename), true)
 	fmt.Println(profileContents)
 	for _, envVar := range []string{"FOO=BAR", "BAZ=BAT"} {
-		if !strings.Contains(profileContents, fmt.Sprintf("export \"%s\"", envVar)) {
+		if !strings.Contains(profileContents, envVar) {
 			t.Fatalf("Env var %s missing from file: %s.", envVar, profileContents)
 		}
 	}