diff --git a/command/server/hcp_link_config_test.go b/command/server/hcp_link_config_test.go
index 3912a3cdab94..51f5a5ec8800 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 daedd3ad6f20..84a101a102a5 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()