diff --git a/src/crypto/tls/bogo_shim_test.go b/src/crypto/tls/bogo_shim_test.go
index 38087d2b1cb..f481a5a40fb 100644
--- a/src/crypto/tls/bogo_shim_test.go
+++ b/src/crypto/tls/bogo_shim_test.go
@@ -54,6 +54,7 @@ var (
 	echConfigListB64           = flag.String("ech-config-list", "", "")
 	expectECHAccepted          = flag.Bool("expect-ech-accept", false, "")
 	expectHRR                  = flag.Bool("expect-hrr", false, "")
+	expectNoHRR                = flag.Bool("expect-no-hrr", false, "")
 	expectedECHRetryConfigs    = flag.String("expect-ech-retry-configs", "", "")
 	expectNoECHRetryConfigs    = flag.Bool("expect-no-ech-retry-configs", false, "")
 	onInitialExpectECHAccepted = flag.Bool("on-initial-expect-ech-accept", false, "")
@@ -283,6 +284,10 @@ func bogoShim() {
 				log.Fatal("expected HRR but did not do it")
 			}
 
+			if *expectNoHRR && cs.testingOnlyDidHRR {
+				log.Fatal("expected no HRR but did do it")
+			}
+
 			if *expectSessionMiss && cs.DidResume {
 				log.Fatal("unexpected session resumption")
 			}