diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD
index 6813564059..68ff31c4ba 100644
--- a/pkg/kubectl/BUILD
+++ b/pkg/kubectl/BUILD
@@ -12,6 +12,7 @@ go_test(
         "cluster_test.go",
         "configmap_test.go",
         "delete_test.go",
+        "deployment_test.go",
         "env_file_test.go",
         "generate_test.go",
         "kubectl_test.go",
diff --git a/pkg/kubectl/deployment_test.go b/pkg/kubectl/deployment_test.go
new file mode 100644
index 0000000000..25569424b5
--- /dev/null
+++ b/pkg/kubectl/deployment_test.go
@@ -0,0 +1,102 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubectl
+
+import (
+	"reflect"
+	"testing"
+
+	"k8s.io/api/core/v1"
+	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestDeploymentBasicGenerate(t *testing.T) {
+	one := int32(1)
+	tests := []struct {
+		name           string
+		deploymentName string
+		images         []string
+		expected       *extensionsv1beta1.Deployment
+		expectErr      bool
+	}{
+		{
+			name:           "deployment name and images ok",
+			deploymentName: "images-name-ok",
+			images:         []string{"nn/image1", "registry/nn/image2", "nn/image3:tag", "nn/image4@digest"},
+			expected: &extensionsv1beta1.Deployment{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:   "images-name-ok",
+					Labels: map[string]string{"app": "images-name-ok"},
+				},
+				Spec: extensionsv1beta1.DeploymentSpec{
+					Replicas: &one,
+					Selector: &metav1.LabelSelector{
+						MatchLabels: map[string]string{"app": "images-name-ok"},
+					},
+					Template: v1.PodTemplateSpec{
+						ObjectMeta: metav1.ObjectMeta{
+							Labels: map[string]string{"app": "images-name-ok"},
+						},
+						Spec: v1.PodSpec{
+							Containers: []v1.Container{
+								{Name: "image1", Image: "nn/image1"},
+								{Name: "image2", Image: "registry/nn/image2"},
+								{Name: "image3", Image: "nn/image3:tag"},
+								{Name: "image4", Image: "nn/image4@digest"},
+							},
+						},
+					},
+				},
+			},
+			expectErr: false,
+		},
+		{
+			name:           "empty images",
+			deploymentName: "images-empty",
+			images:         []string{},
+			expectErr:      true,
+		},
+		{
+			name:           "no images",
+			deploymentName: "images-missing",
+			expectErr:      true,
+		},
+		{
+			name:      "no deployment name and images",
+			expectErr: true,
+		},
+	}
+	for _, test := range tests {
+		generator := &DeploymentBasicGeneratorV1{
+			BaseDeploymentGenerator{
+				Name:   test.deploymentName,
+				Images: test.images,
+			},
+		}
+		obj, err := generator.StructuredGenerate()
+		if !test.expectErr && err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+		if test.expectErr && err != nil {
+			continue
+		}
+		if !reflect.DeepEqual(obj.(*extensionsv1beta1.Deployment), test.expected) {
+			t.Errorf("test: %v\nexpected:\n%#v\nsaw:\n%#v", test.name, test.expected, obj.(*extensionsv1beta1.Deployment))
+		}
+	}
+}