diff --git a/patches/0002-Add-crypto-backend-foundation.patch b/patches/0002-Add-crypto-backend-foundation.patch
index c78c2535d0..0b7aae1354 100644
--- a/patches/0002-Add-crypto-backend-foundation.patch
+++ b/patches/0002-Add-crypto-backend-foundation.patch
@@ -2304,7 +2304,7 @@ index 3091f7a67acede..fead8cc4bec73a 100644
  
 diff --git a/src/hash/notboring_test.go b/src/hash/notboring_test.go
 new file mode 100644
-index 00000000000000..0f289915be6daa
+index 00000000000000..11dc691600b110
 --- /dev/null
 +++ b/src/hash/notboring_test.go
 @@ -0,0 +1,9 @@
@@ -2312,7 +2312,7 @@ index 00000000000000..0f289915be6daa
 +// Use of this source code is governed by a BSD-style
 +// license that can be found in the LICENSE file.
 +
-+//go:build !goexperiment.boringcrypto
++//go:build !goexperiment.systemcrypto
 +
 +package hash_test
 +
diff --git a/patches/0004-Add-OpenSSL-crypto-backend.patch b/patches/0004-Add-OpenSSL-crypto-backend.patch
index b113bd72f4..a704ba4ee8 100644
--- a/patches/0004-Add-OpenSSL-crypto-backend.patch
+++ b/patches/0004-Add-OpenSSL-crypto-backend.patch
@@ -15,12 +15,11 @@ Subject: [PATCH] Add OpenSSL crypto backend
  src/go.sum                                    |   2 +
  src/go/build/deps_test.go                     |   7 +-
  src/go/build/vendor_test.go                   |   1 +
- src/hash/notboring_test.go                    |   2 +-
  .../goexperiment/exp_opensslcrypto_off.go     |   9 +
  .../goexperiment/exp_opensslcrypto_on.go      |   9 +
  src/internal/goexperiment/flags.go            |   1 +
  src/os/exec/exec_test.go                      |   9 +
- 16 files changed, 436 insertions(+), 5 deletions(-)
+ 15 files changed, 435 insertions(+), 4 deletions(-)
  create mode 100644 src/crypto/internal/backend/bbig/big_openssl.go
  create mode 100644 src/crypto/internal/backend/openssl_linux.go
  create mode 100644 src/internal/goexperiment/exp_opensslcrypto_off.go
@@ -569,19 +568,6 @@ index 7f6237ffd59c11..7c821ae4bc5727 100644
  }
  
  // Verify that the vendor directories contain only packages matching the list above.
-diff --git a/src/hash/notboring_test.go b/src/hash/notboring_test.go
-index 0f289915be6daa..bd935326bf7305 100644
---- a/src/hash/notboring_test.go
-+++ b/src/hash/notboring_test.go
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build !goexperiment.boringcrypto
-+//go:build !goexperiment.boringcrypto && !goexperiment.opensslcrypto
- 
- package hash_test
- 
 diff --git a/src/internal/goexperiment/exp_opensslcrypto_off.go b/src/internal/goexperiment/exp_opensslcrypto_off.go
 new file mode 100644
 index 00000000000000..62033547c6143a
diff --git a/patches/0005-Add-CNG-crypto-backend.patch b/patches/0005-Add-CNG-crypto-backend.patch
index 7138972478..efed82b61f 100644
--- a/patches/0005-Add-CNG-crypto-backend.patch
+++ b/patches/0005-Add-CNG-crypto-backend.patch
@@ -16,11 +16,10 @@ Subject: [PATCH] Add CNG crypto backend
  src/go/build/deps_test.go                     |   5 +
  src/go/build/vendor_test.go                   |   1 +
  src/hash/example_test.go                      |   2 +
- src/hash/notboring_test.go                    |   2 +-
  .../goexperiment/exp_cngcrypto_off.go         |   9 +
  src/internal/goexperiment/exp_cngcrypto_on.go |   9 +
  src/internal/goexperiment/flags.go            |   1 +
- 16 files changed, 392 insertions(+), 7 deletions(-)
+ 15 files changed, 391 insertions(+), 6 deletions(-)
  create mode 100644 src/crypto/ecdsa/badlinkname.go
  create mode 100644 src/crypto/internal/backend/bbig/big_cng.go
  create mode 100644 src/crypto/internal/backend/cng_windows.go
@@ -532,19 +531,6 @@ index f07b9aaa2c4898..2ff6c4827391c0 100644
  package hash_test
  
  import (
-diff --git a/src/hash/notboring_test.go b/src/hash/notboring_test.go
-index bd935326bf7305..40c84700690612 100644
---- a/src/hash/notboring_test.go
-+++ b/src/hash/notboring_test.go
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build !goexperiment.boringcrypto && !goexperiment.opensslcrypto
-+//go:build !goexperiment.boringcrypto && !goexperiment.opensslcrypto && !goexperiment.cngcrypto
- 
- package hash_test
- 
 diff --git a/src/internal/goexperiment/exp_cngcrypto_off.go b/src/internal/goexperiment/exp_cngcrypto_off.go
 new file mode 100644
 index 00000000000000..831460053281e2