diff --git a/staging/src/k8s.io/cli-runtime/artifacts/kustomization/configMap.yaml b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/configMap.yaml
new file mode 100644
index 00000000000..00088530945
--- /dev/null
+++ b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/configMap.yaml
@@ -0,0 +1,8 @@
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: the-map
+data:
+  altGreeting: "Good Morning!"
+  enableRisky: "false"
diff --git a/staging/src/k8s.io/cli-runtime/artifacts/kustomization/deployment.yaml b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/deployment.yaml
new file mode 100644
index 00000000000..6e794090805
--- /dev/null
+++ b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/deployment.yaml
@@ -0,0 +1,30 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: the-deployment
+spec:
+  replicas: 3
+  template:
+    metadata:
+      labels:
+        deployment: hello
+    spec:
+      containers:
+      - name: the-container
+        image: monopole/hello:1
+        command: ["/hello",
+                  "--port=8080",
+                  "--enableRiskyFeature=$(ENABLE_RISKY)"]
+        ports:
+        - containerPort: 8080
+        env:
+        - name: ALT_GREETING
+          valueFrom:
+            configMapKeyRef:
+              name: the-map
+              key: altGreeting
+        - name: ENABLE_RISKY
+          valueFrom:
+            configMapKeyRef:
+              name: the-map
+              key: enableRisky
diff --git a/staging/src/k8s.io/cli-runtime/artifacts/kustomization/kustomization.yaml b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/kustomization.yaml
new file mode 100644
index 00000000000..eef31957114
--- /dev/null
+++ b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/kustomization.yaml
@@ -0,0 +1,5 @@
+nameprefix: test-
+resources:
+- deployment.yaml
+- service.yaml
+- configMap.yaml
diff --git a/staging/src/k8s.io/cli-runtime/artifacts/kustomization/service.yaml b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/service.yaml
new file mode 100644
index 00000000000..2942cdb7df0
--- /dev/null
+++ b/staging/src/k8s.io/cli-runtime/artifacts/kustomization/service.yaml
@@ -0,0 +1,13 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: the-service
+spec:
+  selector:
+    deployment: hello
+  type: LoadBalancer
+  ports:
+  - protocol: TCP
+    port: 8666
+    targetPort: 8080
+    
\ No newline at end of file
diff --git a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource/builder_test.go b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource/builder_test.go
index 7fd526b33c6..b41d49580c1 100644
--- a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource/builder_test.go
+++ b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource/builder_test.go
@@ -465,27 +465,48 @@ func TestPathBuilderWithMultipleInvalid(t *testing.T) {
 }
 
 func TestDirectoryBuilder(t *testing.T) {
-	b := newDefaultBuilder().
-		FilenameParam(false, &FilenameOptions{Recursive: false, Filenames: []string{"../../../artifacts/guestbook"}}).
-		NamespaceParam("test").DefaultNamespace()
-
-	test := &testVisitor{}
-	singleItemImplied := false
-
-	err := b.Do().IntoSingleItemImplied(&singleItemImplied).Visit(test.Handle)
-	if err != nil || singleItemImplied || len(test.Infos) < 3 {
-		t.Fatalf("unexpected response: %v %t %#v", err, singleItemImplied, test.Infos)
+	tests := []struct {
+		directories   []string
+		singleItem    bool
+		number        int
+		expectedNames []string
+	}{
+		{[]string{"../../../artifacts/guestbook"}, false, 3, []string{"redis-master"}},
+		{[]string{"../../../artifacts/kustomization"}, true, 3, []string{"test-the-deployment"}},
+		{[]string{"../../../artifacts/guestbook", "../../../artifacts/kustomization"}, false, 6, []string{"redis-master", "test-the-deployment"}},
 	}
 
-	found := false
-	for _, info := range test.Infos {
-		if info.Name == "redis-master" && info.Namespace == "test" && info.Object != nil {
-			found = true
-			break
+	for _, tt := range tests {
+		b := newDefaultBuilder().
+			FilenameParam(false, &FilenameOptions{Recursive: false, EnableKustomization: true, Filenames: tt.directories}).
+			NamespaceParam("test").DefaultNamespace()
+
+		test := &testVisitor{}
+		singleItemImplied := false
+
+		err := b.Do().IntoSingleItemImplied(&singleItemImplied).Visit(test.Handle)
+		if err != nil || singleItemImplied != tt.singleItem || len(test.Infos) < tt.number {
+			t.Fatalf("unexpected response: %v %t %#v", err, singleItemImplied, test.Infos)
+		}
+
+		contained := func(name string) bool {
+			for _, info := range test.Infos {
+				if info.Name == name && info.Namespace == "test" && info.Object != nil {
+					return true
+				}
+			}
+			return false
+		}
+
+		allFound := true
+		for _, name := range tt.expectedNames {
+			if !contained(name) {
+				allFound = false
+			}
+		}
+		if !allFound {
+			t.Errorf("unexpected responses: %#v", test.Infos)
 		}
-	}
-	if !found {
-		t.Errorf("unexpected responses: %#v", test.Infos)
 	}
 }