diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8565e3cc8..a56634faf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           echo 'enterprise=1' >> $GITHUB_OUTPUT
           echo 'go-tags=ent enterprise' >> $GITHUB_OUTPUT
         else
-          echo 'runs-on=ubuntu-latest' >> $GITHUB_OUTPUT
+          echo 'runs-on="ubuntu-latest"' >> $GITHUB_OUTPUT
           echo 'enterprise=' >> $GITHUB_OUTPUT
           echo 'go-tags=' >> $GITHUB_OUTPUT
         fi
diff --git a/Makefile b/Makefile
index ac68d55f0..177ea044b 100644
--- a/Makefile
+++ b/Makefile
@@ -217,7 +217,7 @@ fmtcheck:
 #@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
 
 fmt:
-	find . -name '*.go' | grep -v pb.go | grep -v vendor | xargs gofumpt -w
+	find . -name '*.go' | grep -v pb.go | grep -v vendor | xargs go run mvdan.cc/gofumpt -w
 
 semgrep:
 	semgrep --include '*.go' --exclude 'vendor' -a -f tools/semgrep .
diff --git a/command/server/hcp_link_config_test.go b/command/server/hcp_link_config_test.go
index 3912a3cda..51f5a5ec8 100644
--- a/command/server/hcp_link_config_test.go
+++ b/command/server/hcp_link_config_test.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"os"
 	"testing"
 
 	"github.com/go-test/deep"
@@ -10,9 +9,9 @@ import (
 )
 
 func TestHCPLinkConfig(t *testing.T) {
-	os.Unsetenv("HCP_CLIENT_ID")
-	os.Unsetenv("HCP_CLIENT_SECRET")
-	os.Unsetenv("HCP_RESOURCE_ID")
+	t.Setenv("HCP_CLIENT_ID", "")
+	t.Setenv("HCP_CLIENT_SECRET", "")
+	t.Setenv("HCP_RESOURCE_ID", "")
 
 	config, err := LoadConfigFile("./test-fixtures/hcp_link_config.hcl")
 	if err != nil {
diff --git a/vault/external_tests/hcp_link/hcp_link_test.go b/vault/external_tests/hcp_link/hcp_link_test.go
index daedd3ad6..84a101a10 100644
--- a/vault/external_tests/hcp_link/hcp_link_test.go
+++ b/vault/external_tests/hcp_link/hcp_link_test.go
@@ -8,7 +8,6 @@ import (
 )
 
 func TestHCPLinkConnected(t *testing.T) {
-	t.Parallel()
 	cluster := getTestCluster(t, 2)
 	defer cluster.Cleanup()