diff --git a/integration/run_test.go b/integration/run_test.go
index b82bfbfa5c5..d6d20c82945 100644
--- a/integration/run_test.go
+++ b/integration/run_test.go
@@ -119,6 +119,11 @@ func TestRun(t *testing.T) {
 			args:        []string{"-p", "gcb"},
 			pods:        []string{"getting-started"},
 			remoteOnly:  true,
+		}, {
+			description: "Google Cloud Build - sub folder",
+			dir:         "testdata/gcb-sub-folder",
+			pods:        []string{"getting-started"},
+			remoteOnly:  true,
 		}, {
 			description: "kaniko",
 			dir:         "examples/kaniko",
@@ -129,6 +134,11 @@ func TestRun(t *testing.T) {
 			dir:         "examples/kaniko-local",
 			pods:        []string{"getting-started-kaniko"},
 			remoteOnly:  true,
+		}, {
+			description: "kaniko local - sub folder",
+			dir:         "testdata/kaniko-sub-folder",
+			pods:        []string{"getting-started-kaniko"},
+			remoteOnly:  true,
 		}, {
 			description: "helm",
 			dir:         "examples/helm-deployment",
@@ -294,14 +304,14 @@ func TestFix(t *testing.T) {
 	defer deleteNs()
 
 	fixCmd := exec.Command("skaffold", "fix", "-f", "skaffold.yaml")
-	fixCmd.Dir = "testdata"
+	fixCmd.Dir = "testdata/fix"
 	out, err := util.RunCmdOut(fixCmd)
 	if err != nil {
 		t.Fatalf("testing error: %v", err)
 	}
 
 	runCmd := exec.Command("skaffold", "run", "--namespace", ns.Name, "-f", "-")
-	runCmd.Dir = "testdata"
+	runCmd.Dir = "testdata/fix"
 	runCmd.Stdin = bytes.NewReader(out)
 	err = util.RunCmd(runCmd)
 	if err != nil {
diff --git a/integration/testdata/Dockerfile b/integration/testdata/fix/Dockerfile
similarity index 100%
rename from integration/testdata/Dockerfile
rename to integration/testdata/fix/Dockerfile
diff --git a/integration/testdata/k8s-pod.yaml b/integration/testdata/fix/k8s-pod.yaml
similarity index 100%
rename from integration/testdata/k8s-pod.yaml
rename to integration/testdata/fix/k8s-pod.yaml
diff --git a/integration/testdata/main.go b/integration/testdata/fix/main.go
similarity index 100%
rename from integration/testdata/main.go
rename to integration/testdata/fix/main.go
diff --git a/integration/testdata/skaffold.yaml b/integration/testdata/fix/skaffold.yaml
similarity index 100%
rename from integration/testdata/skaffold.yaml
rename to integration/testdata/fix/skaffold.yaml
diff --git a/integration/testdata/gcb-sub-folder/k8s/pod.yaml b/integration/testdata/gcb-sub-folder/k8s/pod.yaml
new file mode 100644
index 00000000000..869f33a9c34
--- /dev/null
+++ b/integration/testdata/gcb-sub-folder/k8s/pod.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: getting-started
+spec:
+  containers:
+  - name: getting-started
+    image: gcr.io/k8s-skaffold/skaffold-example-sub
diff --git a/integration/testdata/gcb-sub-folder/skaffold.yaml b/integration/testdata/gcb-sub-folder/skaffold.yaml
new file mode 100644
index 00000000000..f0ae43f8b32
--- /dev/null
+++ b/integration/testdata/gcb-sub-folder/skaffold.yaml
@@ -0,0 +1,7 @@
+apiVersion: skaffold/v1beta4
+kind: Config
+build:
+  artifacts:
+  - image: gcr.io/k8s-skaffold/skaffold-example-sub
+    context: sub
+  googleCloudBuild: {}
diff --git a/integration/testdata/gcb-sub-folder/sub/Dockerfile b/integration/testdata/gcb-sub-folder/sub/Dockerfile
new file mode 100644
index 00000000000..184d6cce3e3
--- /dev/null
+++ b/integration/testdata/gcb-sub-folder/sub/Dockerfile
@@ -0,0 +1,7 @@
+FROM golang:1.10.1-alpine3.7 as builder
+COPY main.go .
+RUN go build -o /app main.go
+
+FROM alpine:3.7  
+CMD ["./app"]
+COPY --from=builder /app .
diff --git a/integration/testdata/gcb-sub-folder/sub/main.go b/integration/testdata/gcb-sub-folder/sub/main.go
new file mode 100644
index 00000000000..593721cfe2e
--- /dev/null
+++ b/integration/testdata/gcb-sub-folder/sub/main.go
@@ -0,0 +1,14 @@
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+func main() {
+	for {
+		fmt.Println("Hello world!")
+
+		time.Sleep(time.Second * 1)
+	}
+}
diff --git a/integration/testdata/kaniko-sub-folder/k8s/pod.yaml b/integration/testdata/kaniko-sub-folder/k8s/pod.yaml
new file mode 100644
index 00000000000..79591bacaa6
--- /dev/null
+++ b/integration/testdata/kaniko-sub-folder/k8s/pod.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: getting-started-kaniko
+spec:
+  containers:
+  - name: getting-started
+    image: gcr.io/k8s-skaffold/skaffold-example-sub
diff --git a/integration/testdata/kaniko-sub-folder/skaffold.yaml b/integration/testdata/kaniko-sub-folder/skaffold.yaml
new file mode 100644
index 00000000000..fbf1900e4a4
--- /dev/null
+++ b/integration/testdata/kaniko-sub-folder/skaffold.yaml
@@ -0,0 +1,10 @@
+apiVersion: skaffold/v1beta4
+kind: Config
+build:
+  artifacts:
+  - image: gcr.io/k8s-skaffold/skaffold-example-sub
+    context: sub
+  kaniko:
+    buildContext: 
+      localDir: {}
+    pullSecretName: e2esecret
diff --git a/integration/testdata/kaniko-sub-folder/sub/Dockerfile b/integration/testdata/kaniko-sub-folder/sub/Dockerfile
new file mode 100644
index 00000000000..2d107918ad0
--- /dev/null
+++ b/integration/testdata/kaniko-sub-folder/sub/Dockerfile
@@ -0,0 +1,6 @@
+FROM gcr.io/google-appengine/golang
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/skaffold
+CMD ["./app"]
+COPY main.go .
+RUN go build -o app main.go
diff --git a/integration/testdata/kaniko-sub-folder/sub/main.go b/integration/testdata/kaniko-sub-folder/sub/main.go
new file mode 100644
index 00000000000..64b7bdfc4a1
--- /dev/null
+++ b/integration/testdata/kaniko-sub-folder/sub/main.go
@@ -0,0 +1,13 @@
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+func main() {
+	for {
+		fmt.Println("Hello world!")
+		time.Sleep(time.Second * 1)
+	}
+}