diff --git a/BUILD b/BUILD
index f5bbbdc51..48dc92068 100644
--- a/BUILD
+++ b/BUILD
@@ -121,10 +121,7 @@ boringssl_copts = [
 }) + asm_copts
 
 boringssl_copts_c11 = boringssl_copts + select({
-    # TODO(crbug.com/boringssl/624): This should pass /std:c11 on MSVC. It was
-    # reverted due to https://github.com/bazelbuild/bazel/issues/15073. When
-    # Bazel 6.3.0 is released, restore it and require C11 on MSVC.
-    "@platforms//os:windows": [],
+    "@platforms//os:windows": ["/std:c11"],
     "//conditions:default": gcc_copts_c11,
 })
 
diff --git a/src/ssl/test/runner/handshake_client.go b/src/ssl/test/runner/handshake_client.go
index 0ed0094e9..f198bb2b0 100644
--- a/src/ssl/test/runner/handshake_client.go
+++ b/src/ssl/test/runner/handshake_client.go
@@ -997,6 +997,10 @@ func (hs *clientHandshakeState) doTLS13Handshake(msg any) error {
 	if haveHelloRetryRequest {
 		hs.writeServerHash(helloRetryRequest.marshal())
 
+		if !bytes.Equal(hs.hello.sessionID, helloRetryRequest.sessionID) {
+			return errors.New("tls: ClientHello and HelloRetryRequest session IDs did not match.")
+		}
+
 		if c.config.Bugs.FailIfHelloRetryRequested {
 			return errors.New("tls: unexpected HelloRetryRequest")
 		}
@@ -1097,7 +1101,7 @@ func (hs *clientHandshakeState) doTLS13Handshake(msg any) error {
 	}
 
 	if !bytes.Equal(hs.hello.sessionID, hs.serverHello.sessionID) {
-		return errors.New("tls: session IDs did not match.")
+		return errors.New("tls: ClientHello and ServerHello session IDs did not match.")
 	}
 
 	// Resolve PSK and compute the early secret.
diff --git a/src/util/BUILD.toplevel b/src/util/BUILD.toplevel
index f5bbbdc51..48dc92068 100644
--- a/src/util/BUILD.toplevel
+++ b/src/util/BUILD.toplevel
@@ -121,10 +121,7 @@ boringssl_copts = [
 }) + asm_copts
 
 boringssl_copts_c11 = boringssl_copts + select({
-    # TODO(crbug.com/boringssl/624): This should pass /std:c11 on MSVC. It was
-    # reverted due to https://github.com/bazelbuild/bazel/issues/15073. When
-    # Bazel 6.3.0 is released, restore it and require C11 on MSVC.
-    "@platforms//os:windows": [],
+    "@platforms//os:windows": ["/std:c11"],
     "//conditions:default": gcc_copts_c11,
 })