diff --git a/pkg/cmd/debug/debug_test.go b/pkg/cmd/debug/debug_test.go
index 7869655b1..08225f8e6 100644
--- a/pkg/cmd/debug/debug_test.go
+++ b/pkg/cmd/debug/debug_test.go
@@ -448,7 +448,7 @@ func TestGeneratePodCopyWithDebugContainer(t *testing.T) {
 						"test": "test",
 					},
 					ResourceVersion:   "1",
-					CreationTimestamp: metav1.Time{time.Now()},
+					CreationTimestamp: metav1.Time{Time: time.Now()},
 				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
diff --git a/pkg/cmd/util/helpers_test.go b/pkg/cmd/util/helpers_test.go
index a024f3f34..98ffe8cc7 100644
--- a/pkg/cmd/util/helpers_test.go
+++ b/pkg/cmd/util/helpers_test.go
@@ -338,7 +338,7 @@ func TestCheckInvalidErr(t *testing.T) {
 			DefaultErrorExitCode,
 		},
 		{
-			&errors.StatusError{metav1.Status{
+			&errors.StatusError{ErrStatus: metav1.Status{
 				Status: metav1.StatusFailure,
 				Code:   http.StatusUnprocessableEntity,
 				Reason: metav1.StatusReasonInvalid,
@@ -349,7 +349,7 @@ func TestCheckInvalidErr(t *testing.T) {
 		},
 		// invalid error that that includes a message but no details
 		{
-			&errors.StatusError{metav1.Status{
+			&errors.StatusError{ErrStatus: metav1.Status{
 				Status: metav1.StatusFailure,
 				Code:   http.StatusUnprocessableEntity,
 				Reason: metav1.StatusReasonInvalid,
@@ -361,7 +361,7 @@ func TestCheckInvalidErr(t *testing.T) {
 		},
 		// webhook response that sets code=422 with no reason
 		{
-			&errors.StatusError{metav1.Status{
+			&errors.StatusError{ErrStatus: metav1.Status{
 				Status:  "Failure",
 				Message: `admission webhook "my.webhook" denied the request without explanation`,
 				Code:    422,
@@ -371,7 +371,7 @@ func TestCheckInvalidErr(t *testing.T) {
 		},
 		// webhook response that sets code=422 with no reason and non-nil details
 		{
-			&errors.StatusError{metav1.Status{
+			&errors.StatusError{ErrStatus: metav1.Status{
 				Status:  "Failure",
 				Message: `admission webhook "my.webhook" denied the request without explanation`,
 				Code:    422,
@@ -382,7 +382,7 @@ func TestCheckInvalidErr(t *testing.T) {
 		},
 		// source-wrapped webhook response that sets code=422 with no reason
 		{
-			AddSourceToErr("creating", "configmap.yaml", &errors.StatusError{metav1.Status{
+			AddSourceToErr("creating", "configmap.yaml", &errors.StatusError{ErrStatus: metav1.Status{
 				Status:  "Failure",
 				Message: `admission webhook "my.webhook" denied the request without explanation`,
 				Code:    422,
@@ -392,7 +392,7 @@ func TestCheckInvalidErr(t *testing.T) {
 		},
 		// webhook response that sets reason=Invalid and code=422 and a message
 		{
-			&errors.StatusError{metav1.Status{
+			&errors.StatusError{ErrStatus: metav1.Status{
 				Status:  "Failure",
 				Reason:  "Invalid",
 				Message: `admission webhook "my.webhook" denied the request without explanation`,
diff --git a/pkg/explain/v2/funcs_test.go b/pkg/explain/v2/funcs_test.go
index 037d6f5c7..e505ca64f 100644
--- a/pkg/explain/v2/funcs_test.go
+++ b/pkg/explain/v2/funcs_test.go
@@ -201,11 +201,11 @@ func TestFuncs(t *testing.T) {
 			FuncName: "contains",
 			Source:   `{{contains $.haystack $.needle}}`,
 			Context: map[string]any{
-				"needle": schema.GroupVersionKind{"testgroup.k8s.io", "v1", "Kind"},
+				"needle": schema.GroupVersionKind{Group: "testgroup.k8s.io", Version: "v1", Kind: "Kind"},
 				"haystack": []schema.GroupVersionKind{
-					{"randomgroup.k8s.io", "v1", "OtherKind"},
-					{"testgroup.k8s.io", "v1", "OtherKind"},
-					{"testgroup.k8s.io", "v1", "Kind"},
+					{Group: "randomgroup.k8s.io", Version: "v1", Kind: "OtherKind"},
+					{Group: "testgroup.k8s.io", Version: "v1", Kind: "OtherKind"},
+					{Group: "testgroup.k8s.io", Version: "v1", Kind: "Kind"},
 				},
 			},
 			Expect: `true`,
diff --git a/pkg/polymorphichelpers/history_test.go b/pkg/polymorphichelpers/history_test.go
index cb77ecdb7..4f55326d0 100644
--- a/pkg/polymorphichelpers/history_test.go
+++ b/pkg/polymorphichelpers/history_test.go
@@ -92,7 +92,7 @@ func TestViewDeploymentHistory(t *testing.T) {
 				Namespace:       "default",
 				UID:             types.UID(fmt.Sprintf("00000000-0000-0000-0000-00000000000%d", i)),
 				Labels:          map[string]string{"foo": "bar"},
-				OwnerReferences: []metav1.OwnerReference{{"apps/v1", "Deployment", deployment.Name, deployment.UID, &trueVar, nil}},
+				OwnerReferences: []metav1.OwnerReference{{APIVersion: "apps/v1", Kind: "Deployment", Name: deployment.Name, UID: deployment.UID, Controller: &trueVar}},
 				Annotations: map[string]string{
 					"deployment.kubernetes.io/revision": fmt.Sprintf("%d", i),
 				},
@@ -219,7 +219,7 @@ func TestViewHistory(t *testing.T) {
 				Name:            "moons",
 				Namespace:       "default",
 				Labels:          map[string]string{"foo": "bar"},
-				OwnerReferences: []metav1.OwnerReference{{"apps/v1", "StatefulSet", "moons", "1993", &trueVar, nil}},
+				OwnerReferences: []metav1.OwnerReference{{APIVersion: "apps/v1", Kind: "StatefulSet", Name: "moons", UID: "1993", Controller: &trueVar}},
 			},
 			Data:     runtime.RawExtension{Raw: stsRawData},
 			TypeMeta: metav1.TypeMeta{Kind: "StatefulSet", APIVersion: "apps/v1"},
@@ -323,7 +323,7 @@ func TestViewHistory(t *testing.T) {
 				Name:            "moons",
 				Namespace:       "default",
 				Labels:          map[string]string{"foo": "bar"},
-				OwnerReferences: []metav1.OwnerReference{{"apps/v1", "DaemonSet", "moons", "1993", &trueVar, nil}},
+				OwnerReferences: []metav1.OwnerReference{{APIVersion: "apps/v1", Kind: "DaemonSet", Name: "moons", UID: "1993", Controller: &trueVar}},
 			},
 			Data:     runtime.RawExtension{Raw: daemonSetRaw},
 			TypeMeta: metav1.TypeMeta{Kind: "StatefulSet", APIVersion: "apps/v1"},
diff --git a/pkg/util/i18n/i18n_test.go b/pkg/util/i18n/i18n_test.go
index 3098e6db5..57b228165 100644
--- a/pkg/util/i18n/i18n_test.go
+++ b/pkg/util/i18n/i18n_test.go
@@ -138,6 +138,7 @@ func TestTranslationUsingEnvVar(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			for _, envVar := range envVarsToBackup {
 				if envVarValue := os.Getenv(envVar); envVarValue != "" {
+					envVarValue, envVar := envVarValue, envVar
 					os.Unsetenv(envVar)
 					// Restore env var at the end
 					defer func() { os.Setenv(envVar, envVarValue) }()