diff --git a/Dockerfile b/Dockerfile
index 9a4595d48..94fc7862b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,5 +15,5 @@
 # Builds the static Go image to execute in a Kubernetes job
 
 FROM scratch
-ADD out/executor /work-dir/executor
+ADD out/executor /workspace/executor
 ADD files/ca-certificates.crt /etc/ssl/certs/
diff --git a/Gopkg.lock b/Gopkg.lock
index d4fb961c0..f7b4dcdb0 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -292,6 +292,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c5933c09ead2842baa85dcb4321cef9623f4ab6ec4f6c84b6579071aa1baf3e4"
+  inputs-digest = "6e9d101389852c13c0a3dc486d69b0438b6518c42d9031e3bf0c41d7d1943438"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/integration_tests/integration_test.go b/integration_tests/integration_test.go
index 9f3222918..884c9ca3d 100644
--- a/integration_tests/integration_test.go
+++ b/integration_tests/integration_test.go
@@ -36,7 +36,7 @@ var imageTests = []struct {
 	{
 		description: "test extract filesystem",
 		repo:        "extract-filesystem",
-		added:       []string{"/work-dir", "/work-dir/executor", "/dockerfile", "/dockerfile/Dockerfile"},
+		added:       []string{"/workspace", "/workspace/executor", "/workspace/Dockerfile"},
 		deleted:     []string{"/proc", "/sys", "/dev", "/etc/hosts", "/etc/resolv.conf"},
 	},
 }
diff --git a/integration_tests/integration_test_yaml.go b/integration_tests/integration_test_yaml.go
index 7bd3789de..ff36a6424 100644
--- a/integration_tests/integration_test_yaml.go
+++ b/integration_tests/integration_test_yaml.go
@@ -47,7 +47,7 @@ type testyaml struct {
 }
 
 var executorImage = "executor-image"
-var executorCommand = "/work-dir/executor"
+var executorCommand = "/workspace/executor"
 var dockerImage = "gcr.io/cloud-builders/docker"
 var testRepo = "gcr.io/kbuild-test/"
 var dockerPrefix = "docker-"
@@ -85,7 +85,7 @@ func main() {
 		var commitID = "test"
 		kbuild := step{
 			Name: dockerImage,
-			Args: []string{"run", "-v", dockerfilePath + ":/dockerfile/Dockerfile", "--name", commitID, executorImage, executorCommand},
+			Args: []string{"run", "-v", dockerfilePath + ":/workspace/Dockerfile", "--name", commitID, executorImage, executorCommand},
 		}
 
 		commit := step{
@@ -98,7 +98,7 @@ func main() {
 	integrationTests := step{
 		Name: "gcr.io/cloud-builders/go:debian",
 		Args: []string{"test", "integration_tests/integration_test.go"},
-		Env:  []string{"GOPATH=/", "PATH=/builder/bin:/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/workspace"},
+		Env:  []string{"GOPATH=/", "PATH=/builder/bin:/go/bin:/usr/local/go/bin:/workspace"},
 	}
 	y.Steps = append(y.Steps, integrationTests)