diff --git a/pkg/deepcopy/testdata/cronjob_types.go b/pkg/deepcopy/testdata/cronjob_types.go
index 2bd3bb22a..c399b95a7 100644
--- a/pkg/deepcopy/testdata/cronjob_types.go
+++ b/pkg/deepcopy/testdata/cronjob_types.go
@@ -116,7 +116,7 @@ type SpecificCases struct {
 
 	// other map types
 	MapToDeepCopyPtr              map[string]DeepCopyPtr        `json:"mapToDeepCopyPtr"`
-	MapToDeepCopyNonPtr           map[string]DeepCopyPtr        `json:"mapToDeepCopyNonPtr"`
+	MapToDeepCopyNonPtr           map[string]DeepCopyNonPtr     `json:"mapToDeepCopyNonPtr"`
 	MapToDeepCopyIntoPtr          map[string]DeepCopyIntoPtr    `json:"mapToDeepCopyIntoPtr"`
 	MapToDeepCopyIntoNonPtr       map[string]DeepCopyIntoNonPtr `json:"mapToDeepCopyIntoNonPtr"`
 	MapToShallowNamedType         map[string]TotallyAString     `json:"mapToShallowNamedType"`
@@ -129,7 +129,7 @@ type SpecificCases struct {
 
 	// other slice types
 	SliceToDeepCopyPtr        []DeepCopyPtr        `json:"sliceToDeepCopyPtr"`
-	SliceToDeepCopyNonPtr     []DeepCopyPtr        `json:"sliceToDeepCopyNonPtr"`
+	SliceToDeepCopyNonPtr     []DeepCopyNonPtr     `json:"sliceToDeepCopyNonPtr"`
 	SliceToDeepCopyIntoPtr    []DeepCopyIntoPtr    `json:"sliceToDeepCopyIntoPtr"`
 	SliceToDeepCopyIntoNonPtr []DeepCopyIntoNonPtr `json:"sliceToDeepCopyIntoNonPtr"`
 	SliceToShallowNamedType   []TotallyAString     `json:"sliceToShallowNamedType"`
@@ -138,7 +138,7 @@ type SpecificCases struct {
 
 	// other pointer types
 	PtrToDeepCopyPtr        *DeepCopyPtr        `json:"ptrToDeepCopyPtr"`
-	PtrToDeepCopyNonPtr     *DeepCopyPtr        `json:"ptrToDeepCopyNonPtr"`
+	PtrToDeepCopyNonPtr     *DeepCopyNonPtr     `json:"ptrToDeepCopyNonPtr"`
 	PtrToDeepCopyIntoPtr    *DeepCopyIntoPtr    `json:"ptrToDeepCopyIntoPtr"`
 	PtrToDeepCopyIntoNonPtr *DeepCopyIntoNonPtr `json:"ptrToDeepCopyIntoNonPtr"`
 	PtrToShallowNamedType   *TotallyAString     `json:"ptrToShallowNamedType"`
diff --git a/pkg/deepcopy/testdata/zz_generated.deepcopy.go b/pkg/deepcopy/testdata/zz_generated.deepcopy.go
index f09fe7d41..704558436 100644
--- a/pkg/deepcopy/testdata/zz_generated.deepcopy.go
+++ b/pkg/deepcopy/testdata/zz_generated.deepcopy.go
@@ -609,9 +609,9 @@ func (in *SpecificCases) DeepCopyInto(out *SpecificCases) {
 	}
 	if in.MapToDeepCopyNonPtr != nil {
 		in, out := &in.MapToDeepCopyNonPtr, &out.MapToDeepCopyNonPtr
-		*out = make(map[string]DeepCopyPtr, len(*in))
+		*out = make(map[string]DeepCopyNonPtr, len(*in))
 		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
+			(*out)[key] = val.DeepCopy()
 		}
 	}
 	if in.MapToDeepCopyIntoPtr != nil {
@@ -709,7 +709,7 @@ func (in *SpecificCases) DeepCopyInto(out *SpecificCases) {
 	}
 	if in.SliceToDeepCopyNonPtr != nil {
 		in, out := &in.SliceToDeepCopyNonPtr, &out.SliceToDeepCopyNonPtr
-		*out = make([]DeepCopyPtr, len(*in))
+		*out = make([]DeepCopyNonPtr, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -757,7 +757,8 @@ func (in *SpecificCases) DeepCopyInto(out *SpecificCases) {
 	}
 	if in.PtrToDeepCopyNonPtr != nil {
 		in, out := &in.PtrToDeepCopyNonPtr, &out.PtrToDeepCopyNonPtr
-		*out = (*in).DeepCopy()
+		x := (*in).DeepCopy()
+		*out = &x
 	}
 	if in.PtrToDeepCopyIntoPtr != nil {
 		in, out := &in.PtrToDeepCopyIntoPtr, &out.PtrToDeepCopyIntoPtr