diff --git a/pkg/build/controller/strategy/custom_test.go b/pkg/build/controller/strategy/custom_test.go
index d657c6d63d00..2503cca3d0a2 100644
--- a/pkg/build/controller/strategy/custom_test.go
+++ b/pkg/build/controller/strategy/custom_test.go
@@ -41,6 +41,18 @@ func TestCustomCreateBuildPod(t *testing.T) {
 	if actual.Spec.RestartPolicy != kapi.RestartPolicyNever {
 		t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)
 	}
+	if len(container.VolumeMounts) != 2 {
+		t.Fatalf("Expected 2 volumes in container, got %d", len(container.VolumeMounts))
+	}
+	if container.VolumeMounts[0].MountPath != dockerSocketPath {
+		t.Fatalf("Expected %s in first VolumeMount, got %s", dockerSocketPath, container.VolumeMounts[0].MountPath)
+	}
+	if container.VolumeMounts[1].MountPath != dockerPushSecretMountPath {
+		t.Fatalf("Expected %s in first VolumeMount, got %s", dockerPushSecretMountPath, container.VolumeMounts[1].MountPath)
+	}
+	if len(actual.Spec.Volumes) != 2 {
+		t.Fatalf("Expected 2 volumes in Build pod, got %d", len(actual.Spec.Volumes))
+	}
 	buildJSON, _ := v1beta1.Codec.Encode(expected)
 	errorCases := map[int][]string{
 		0: {"BUILD", string(buildJSON)},
@@ -95,6 +107,7 @@ func mockCustomBuild() *buildapi.Build {
 			},
 			Output: buildapi.BuildOutput{
 				DockerImageReference: "docker-registry/repository/customBuild",
+				PushSecretName:       "foo",
 			},
 		},
 		Status:  buildapi.BuildStatusNew,
diff --git a/pkg/build/controller/strategy/docker_test.go b/pkg/build/controller/strategy/docker_test.go
index 3c406c46584e..153d114a36d6 100644
--- a/pkg/build/controller/strategy/docker_test.go
+++ b/pkg/build/controller/strategy/docker_test.go
@@ -35,8 +35,20 @@ func TestDockerCreateBuildPod(t *testing.T) {
 	if actual.Spec.RestartPolicy != kapi.RestartPolicyNever {
 		t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)
 	}
-	if len(container.Env) != 1 {
-		t.Fatalf("Expected 1 element in Env table, got %d", len(container.Env))
+	if len(container.VolumeMounts) != 2 {
+		t.Fatalf("Expected 2 volumes in container, got %d", len(container.VolumeMounts))
+	}
+	if container.VolumeMounts[0].MountPath != dockerSocketPath {
+		t.Fatalf("Expected %s in first VolumeMount, got %s", dockerSocketPath, container.VolumeMounts[0].MountPath)
+	}
+	if container.VolumeMounts[1].MountPath != dockerPushSecretMountPath {
+		t.Fatalf("Expected %s in first VolumeMount, got %s", dockerPushSecretMountPath, container.VolumeMounts[1].MountPath)
+	}
+	if len(actual.Spec.Volumes) != 2 {
+		t.Fatalf("Expected 2 volumes in Build pod, got %d", len(actual.Spec.Volumes))
+	}
+	if len(container.Env) != 3 {
+		t.Fatalf("Expected 3 elements in Env table, got %d", len(container.Env))
 	}
 	buildJSON, _ := v1beta1.Codec.Encode(expected)
 	errorCases := map[int][]string{
@@ -73,6 +85,7 @@ func mockDockerBuild() *buildapi.Build {
 			},
 			Output: buildapi.BuildOutput{
 				DockerImageReference: "docker-registry/repository/dockerBuild",
+				PushSecretName:       "foo",
 			},
 		},
 		Status:  buildapi.BuildStatusNew,
diff --git a/pkg/build/controller/strategy/sti_test.go b/pkg/build/controller/strategy/sti_test.go
index ccb4d171aaeb..c514e9297bef 100644
--- a/pkg/build/controller/strategy/sti_test.go
+++ b/pkg/build/controller/strategy/sti_test.go
@@ -41,8 +41,20 @@ func TestSTICreateBuildPod(t *testing.T) {
 	if actual.Spec.RestartPolicy != kapi.RestartPolicyNever {
 		t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)
 	}
-	if len(container.Env) != 4 {
-		t.Fatalf("Expected 4 elements in Env table, got %d", len(container.Env))
+	if len(container.Env) != 6 {
+		t.Fatalf("Expected 6 elements in Env table, got %d", len(container.Env))
+	}
+	if len(container.VolumeMounts) != 2 {
+		t.Fatalf("Expected 2 volumes in container, got %d", len(container.VolumeMounts))
+	}
+	if container.VolumeMounts[0].MountPath != dockerSocketPath {
+		t.Fatalf("Expected %s in first VolumeMount, got %s", dockerSocketPath, container.VolumeMounts[0].MountPath)
+	}
+	if container.VolumeMounts[1].MountPath != dockerPushSecretMountPath {
+		t.Fatalf("Expected %s in first VolumeMount, got %s", dockerPushSecretMountPath, container.VolumeMounts[1].MountPath)
+	}
+	if len(actual.Spec.Volumes) != 2 {
+		t.Fatalf("Expected 2 volumes in Build pod, got %d", len(actual.Spec.Volumes))
 	}
 	found := false
 	for _, v := range container.Env {
@@ -93,6 +105,7 @@ func mockSTIBuild() *buildapi.Build {
 			},
 			Output: buildapi.BuildOutput{
 				DockerImageReference: "docker-registry/repository/stiBuild",
+				PushSecretName:       "foo",
 			},
 		},
 		Status:  buildapi.BuildStatusNew,