diff --git a/pkg/kubelet/dockershim/security_context_test.go b/pkg/kubelet/dockershim/security_context_test.go
index 3fe3646906d..0c1360226fa 100644
--- a/pkg/kubelet/dockershim/security_context_test.go
+++ b/pkg/kubelet/dockershim/security_context_test.go
@@ -59,6 +59,18 @@ func TestModifyContainerConfig(t *testing.T) {
 			},
 			isErr: false,
 		},
+		{
+			name: "container.SecurityContext.RunAsUsername and container.SecurityContext.RunAsUser set",
+			sc: &runtimeapi.LinuxContainerSecurityContext{
+				RunAsUsername: username,
+				RunAsUser:     &runtimeapi.Int64Value{Value: uid},
+			},
+			expected: &dockercontainer.Config{
+				User: username,
+			},
+			isErr: false,
+		},
+
 		{
 			name:     "no RunAsUser value set",
 			sc:       &runtimeapi.LinuxContainerSecurityContext{},
@@ -94,6 +106,18 @@ func TestModifyContainerConfig(t *testing.T) {
 			},
 			isErr: true,
 		},
+		{
+			name: "RunAsUser/RunAsUsername both set, RunAsGroup set",
+			sc: &runtimeapi.LinuxContainerSecurityContext{
+				RunAsUser:     &runtimeapi.Int64Value{Value: uid},
+				RunAsUsername: username,
+				RunAsGroup:    &runtimeapi.Int64Value{Value: gid},
+			},
+			expected: &dockercontainer.Config{
+				User: "testuser:423",
+			},
+			isErr: false,
+		},
 	}
 
 	for _, tc := range cases {