diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index abb0f837b..1b29d44bd 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -13,7 +13,7 @@ on:
 env:
   GOPATH: /opt/go
   PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GO_VER: 1.20.5
+  GO_VER: 1.21.5
 
 permissions:
   contents: read
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f65ca9096..b652ff9ed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
     tags: [ v1.* ]
 
 env:
-  GO_VER: 1.20.5
+  GO_VER: 1.21.5
   UBUNTU_VER: 20.04
   DOCKER_REGISTRY: ${{ github.repository_owner == 'hyperledger' && 'docker.io' || 'ghcr.io' }}
   IMAGE_NAME: ${{ github.repository }}
diff --git a/Makefile b/Makefile
index c4762bee5..86e593964 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@
 
 PROJECT_NAME = fabric-ca
 
-GO_VER = 1.20.5
+GO_VER = 1.21.5
 UBUNTU_VER ?= 20.04
 DEBIAN_VER ?= stretch
 BASE_VERSION ?= v1.5.7
diff --git a/lib/server/operations/system_test.go b/lib/server/operations/system_test.go
index c9cb19c18..9e9a4b587 100644
--- a/lib/server/operations/system_test.go
+++ b/lib/server/operations/system_test.go
@@ -91,7 +91,7 @@ var _ = Describe("System", func() {
 
 			_, err = unauthClient.Get(fmt.Sprintf("https://%s/metrics", system.Addr()))
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("remote error: tls: bad certificate"))
+			Expect(err.Error()).To(ContainSubstring("remote error: tls: certificate required"))
 		})
 	})