diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/decode_test.go b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/decode_test.go
index f9e45ec6dc3..98c164a2287 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/decode_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/decode_test.go
@@ -105,13 +105,13 @@ func TestDecode(t *testing.T) {
 			assertOnError: assertNilError,
 		},
 	} {
-		ms := tc.modes
-		if len(ms) == 0 {
-			ms = allDecModes
+		decModes := tc.modes
+		if len(decModes) == 0 {
+			decModes = allDecModes
 		}
 
-		for _, dm := range ms {
-			modeName, ok := decModeNames[dm]
+		for _, decMode := range decModes {
+			modeName, ok := decModeNames[decMode]
 			if !ok {
 				t.Fatal("test case configured to run against unrecognized mode")
 			}
@@ -124,7 +124,7 @@ func TestDecode(t *testing.T) {
 				} else {
 					dst = reflect.New(reflect.TypeOf(tc.into))
 				}
-				err := dm.Unmarshal(tc.in, dst.Interface())
+				err := decMode.Unmarshal(tc.in, dst.Interface())
 				tc.assertOnError(t, err)
 				if tc.want != nil {
 					if diff := cmp.Diff(tc.want, dst.Elem().Interface()); diff != "" {
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/roundtrip_test.go b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/roundtrip_test.go
index 9d7d8f06a50..b5c9b05186b 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/roundtrip_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/roundtrip_test.go
@@ -260,24 +260,24 @@ func TestRoundtrip(t *testing.T) {
 			}{},
 		},
 	} {
-		mps := tc.modePairs
-		if len(mps) == 0 {
+		modePairs := tc.modePairs
+		if len(modePairs) == 0 {
 			// Default is all modes to all modes.
-			mps = []modePair{}
-			for _, em := range allEncModes {
-				for _, dm := range allDecModes {
-					mps = append(mps, modePair{enc: em, dec: dm})
+			modePairs = []modePair{}
+			for _, encMode := range allEncModes {
+				for _, decMode := range allDecModes {
+					modePairs = append(modePairs, modePair{enc: encMode, dec: decMode})
 				}
 			}
 		}
 
-		for _, mp := range mps {
-			encModeName, ok := encModeNames[mp.enc]
+		for _, modePair := range modePairs {
+			encModeName, ok := encModeNames[modePair.enc]
 			if !ok {
 				t.Fatal("test case configured to run against unrecognized encode mode")
 			}
 
-			decModeName, ok := decModeNames[mp.dec]
+			decModeName, ok := decModeNames[modePair.dec]
 			if !ok {
 				t.Fatal("test case configured to run against unrecognized decode mode")
 			}
@@ -285,13 +285,13 @@ func TestRoundtrip(t *testing.T) {
 			t.Run(fmt.Sprintf("enc=%s/dec=%s/%s", encModeName, decModeName, tc.name), func(t *testing.T) {
 				original := tc.obj
 
-				b, err := mp.enc.Marshal(original)
+				b, err := modePair.enc.Marshal(original)
 				if err != nil {
 					t.Fatalf("unexpected error from Marshal: %v", err)
 				}
 
 				final := reflect.New(reflect.TypeOf(original))
-				err = mp.dec.Unmarshal(b, final.Interface())
+				err = modePair.dec.Unmarshal(b, final.Interface())
 				if err != nil {
 					t.Fatalf("unexpected error from Unmarshal: %v", err)
 				}