diff --git a/pkg/apis/extensions/v1beta1/defaults_test.go b/pkg/apis/extensions/v1beta1/defaults_test.go
index 28a24dd4326..5bd43d040ce 100644
--- a/pkg/apis/extensions/v1beta1/defaults_test.go
+++ b/pkg/apis/extensions/v1beta1/defaults_test.go
@@ -45,6 +45,14 @@ func TestSetDefaultDaemonSet(t *testing.T) {
 			Labels: defaultLabels,
 		},
 	}
+	templateNoLabel := v1.PodTemplateSpec{
+		Spec: v1.PodSpec{
+			DNSPolicy:                     v1.DNSClusterFirst,
+			RestartPolicy:                 v1.RestartPolicyAlways,
+			SecurityContext:               &v1.PodSecurityContext{},
+			TerminationGracePeriodSeconds: &period,
+		},
+	}
 	tests := []struct {
 		original *DaemonSet
 		expected *DaemonSet
@@ -116,6 +124,7 @@ func TestSetDefaultDaemonSet(t *testing.T) {
 			original: &DaemonSet{},
 			expected: &DaemonSet{
 				Spec: DaemonSetSpec{
+					Template: templateNoLabel,
 					UpdateStrategy: DaemonSetUpdateStrategy{
 						Type: RollingUpdateDaemonSetStrategyType,
 						RollingUpdate: &RollingUpdateDaemonSet{
@@ -136,6 +145,7 @@ func TestSetDefaultDaemonSet(t *testing.T) {
 			},
 			expected: &DaemonSet{
 				Spec: DaemonSetSpec{
+					Template: templateNoLabel,
 					UpdateStrategy: DaemonSetUpdateStrategy{
 						Type: RollingUpdateDaemonSetStrategyType,
 						RollingUpdate: &RollingUpdateDaemonSet{
@@ -157,6 +167,7 @@ func TestSetDefaultDaemonSet(t *testing.T) {
 			},
 			expected: &DaemonSet{
 				Spec: DaemonSetSpec{
+					Template: templateNoLabel,
 					UpdateStrategy: DaemonSetUpdateStrategy{
 						Type: RollingUpdateDaemonSetStrategyType,
 						RollingUpdate: &RollingUpdateDaemonSet{
diff --git a/pkg/apis/extensions/validation/validation_test.go b/pkg/apis/extensions/validation/validation_test.go
index b1de89b352e..e338160f8a1 100644
--- a/pkg/apis/extensions/validation/validation_test.go
+++ b/pkg/apis/extensions/validation/validation_test.go
@@ -726,7 +726,7 @@ func TestValidateDaemonSet(t *testing.T) {
 			},
 			Spec: extensions.DaemonSetSpec{
 				Selector: &extensions.LabelSelector{MatchLabels: validSelector},
-				Template: &validPodTemplate.Template,
+				Template: validPodTemplate.Template,
 				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
 					Type: "",
 					RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -742,7 +742,7 @@ func TestValidateDaemonSet(t *testing.T) {
 			},
 			Spec: extensions.DaemonSetSpec{
 				Selector: &extensions.LabelSelector{MatchLabels: validSelector},
-				Template: &validPodTemplate.Template,
+				Template: validPodTemplate.Template,
 				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
 					Type:          extensions.RollingUpdateDaemonSetStrategyType,
 					RollingUpdate: nil,
@@ -756,7 +756,7 @@ func TestValidateDaemonSet(t *testing.T) {
 			},
 			Spec: extensions.DaemonSetSpec{
 				Selector: &extensions.LabelSelector{MatchLabels: validSelector},
-				Template: &validPodTemplate.Template,
+				Template: validPodTemplate.Template,
 				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
 					Type: extensions.RollingUpdateDaemonSetStrategyType,
 					RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -773,7 +773,7 @@ func TestValidateDaemonSet(t *testing.T) {
 			},
 			Spec: extensions.DaemonSetSpec{
 				Selector: &extensions.LabelSelector{MatchLabels: validSelector},
-				Template: &validPodTemplate.Template,
+				Template: validPodTemplate.Template,
 				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
 					Type: extensions.RollingUpdateDaemonSetStrategyType,
 					RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -790,7 +790,7 @@ func TestValidateDaemonSet(t *testing.T) {
 			},
 			Spec: extensions.DaemonSetSpec{
 				Selector: &extensions.LabelSelector{MatchLabels: validSelector},
-				Template: &validPodTemplate.Template,
+				Template: validPodTemplate.Template,
 				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
 					Type: extensions.RollingUpdateDaemonSetStrategyType,
 					RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -807,7 +807,7 @@ func TestValidateDaemonSet(t *testing.T) {
 			},
 			Spec: extensions.DaemonSetSpec{
 				Selector: &extensions.LabelSelector{MatchLabels: validSelector},
-				Template: &validPodTemplate.Template,
+				Template: validPodTemplate.Template,
 				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
 					Type: extensions.RollingUpdateDaemonSetStrategyType,
 					RollingUpdate: &extensions.RollingUpdateDaemonSet{