diff --git a/staging/src/k8s.io/kubectl/pkg/explain/explain_test.go b/staging/src/k8s.io/kubectl/pkg/explain/explain_test.go
index 0e691cc8b5c..d582e362100 100644
--- a/staging/src/k8s.io/kubectl/pkg/explain/explain_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/explain/explain_test.go
@@ -90,3 +90,69 @@ func TestSplitAndParseResourceRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestSplitAndParseResourceRequestWithMatchingPrefix(t *testing.T) {
+	tests := []struct {
+		name       string
+		inResource string
+
+		expectedGVR        schema.GroupVersionResource
+		expectedFieldsPath []string
+		expectedErr        bool
+	}{
+		{
+			name:       "no trailing period",
+			inResource: "pods.field2.field3",
+
+			expectedGVR:        schema.GroupVersionResource{Resource: "pods", Version: "v1"},
+			expectedFieldsPath: []string{"field2", "field3"},
+		},
+		{
+			name:       "trailing period with correct fieldsPath",
+			inResource: "service.field2.field3.",
+
+			expectedGVR:        schema.GroupVersionResource{Resource: "services", Version: "v1"},
+			expectedFieldsPath: []string{"field2", "field3"},
+		},
+		{
+			name:       "field with dots 1",
+			inResource: `service.field2['field\.with\.dots']`,
+
+			expectedGVR:        schema.GroupVersionResource{Resource: "services", Version: "v1"},
+			expectedFieldsPath: []string{"field2", "field.with.dots"},
+		},
+		{
+			name:       "field with dots 2",
+			inResource: `service.field2.field\.with\.dots`,
+
+			expectedGVR:        schema.GroupVersionResource{Resource: "services", Version: "v1"},
+			expectedFieldsPath: []string{"field2", "field.with.dots"},
+		},
+		{
+			name:       "trailing period with incorrect fieldsPath",
+			inResource: "node.field2.field3.",
+
+			expectedGVR:        schema.GroupVersionResource{Resource: "nodes", Version: "v1"},
+			expectedFieldsPath: []string{"field2", "field3", ""},
+			expectedErr:        true,
+		},
+	}
+
+	mapper := testrestmapper.TestOnlyStaticRESTMapper(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotGVR, gotFieldsPath, err := SplitAndParseResourceRequestWithMatchingPrefix(tt.inResource, mapper)
+			if err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
+
+			if !reflect.DeepEqual(tt.expectedGVR, gotGVR) && !tt.expectedErr {
+				t.Errorf("%s: expected inResource: %s, got: %s", tt.name, tt.expectedGVR, gotGVR)
+			}
+
+			if !reflect.DeepEqual(tt.expectedFieldsPath, gotFieldsPath) && !tt.expectedErr {
+				t.Errorf("%s: expected fieldsPath: %s, got: %s", tt.name, tt.expectedFieldsPath, gotFieldsPath)
+			}
+		})
+	}
+}