diff --git a/pkg/api/conversion.go b/pkg/api/conversion.go
index 8411b9299ad..e7c57d41373 100644
--- a/pkg/api/conversion.go
+++ b/pkg/api/conversion.go
@@ -39,15 +39,6 @@ func init() {
 				obj.FieldSelector = unversioned.FieldSelector{fields.Everything()}
 			}
 		},
-		// TODO: see about moving this into v1/defaults.go
-		func(obj *PodExecOptions) {
-			obj.Stderr = true
-			obj.Stdout = true
-		},
-		func(obj *PodAttachOptions) {
-			obj.Stderr = true
-			obj.Stdout = true
-		},
 	)
 	Scheme.AddConversionFuncs(
 		func(in *unversioned.Time, out *unversioned.Time, s conversion.Scope) error {
diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go
index bcd7bf69b21..e08812fcbe2 100644
--- a/pkg/api/serialization_test.go
+++ b/pkg/api/serialization_test.go
@@ -70,7 +70,7 @@ func roundTrip(t *testing.T, codec runtime.Codec, item runtime.Object) {
 		return
 	}
 	if !api.Semantic.DeepEqual(item, obj2) {
-		t.Errorf("1: %v: diff: %v\nCodec: %v\nSource:\n\n%#v\n\nEncoded:\n\n%s\n\nFinal:\n\n%#v", name, util.ObjectGoPrintDiff(item, obj2), codec, printer.Sprintf("%#v", item), string(data), printer.Sprintf("%#v", obj2))
+		t.Errorf("\n1: %v: diff: %v\nCodec: %v\nSource:\n\n%#v\n\nEncoded:\n\n%s\n\nFinal:\n\n%#v", name, util.ObjectGoPrintDiff(item, obj2), codec, printer.Sprintf("%#v", item), string(data), printer.Sprintf("%#v", obj2))
 		return
 	}
 
@@ -133,7 +133,8 @@ func TestList(t *testing.T) {
 }
 
 var nonRoundTrippableTypes = sets.NewString()
-var nonInternalRoundTrippableTypes = sets.NewString("List", "ListOptions", "PodExecOptions", "PodAttachOptions")
+
+var nonInternalRoundTrippableTypes = sets.NewString("List", "ListOptions")
 var nonRoundTrippableTypesByVersion = map[string][]string{}
 
 func TestRoundTripTypes(t *testing.T) {
diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go
index 29e549808e2..b1d795c9b92 100644
--- a/pkg/api/testing/fuzzer.go
+++ b/pkg/api/testing/fuzzer.go
@@ -104,6 +104,14 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
 			field, _ := fields.ParseSelector("a=b")
 			j.FieldSelector = unversioned.FieldSelector{field}
 		},
+		func(j *api.PodExecOptions, c fuzz.Continue) {
+			j.Stdout = true
+			j.Stderr = true
+		},
+		func(j *api.PodAttachOptions, c fuzz.Continue) {
+			j.Stdout = true
+			j.Stderr = true
+		},
 		func(s *api.PodSpec, c fuzz.Continue) {
 			c.FuzzNoCustom(s)
 			// has a default value
diff --git a/pkg/api/v1/defaults.go b/pkg/api/v1/defaults.go
index 68ce75bb951..c8383163577 100644
--- a/pkg/api/v1/defaults.go
+++ b/pkg/api/v1/defaults.go
@@ -26,6 +26,14 @@ import (
 
 func addDefaultingFuncs() {
 	api.Scheme.AddDefaultingFuncs(
+		func(obj *PodExecOptions) {
+			obj.Stdout = true
+			obj.Stderr = true
+		},
+		func(obj *PodAttachOptions) {
+			obj.Stdout = true
+			obj.Stderr = true
+		},
 		func(obj *ReplicationController) {
 			var labels map[string]string
 			if obj.Spec.Template != nil {