diff --git a/.golangci.yml b/.golangci.yml
index 02332f385..c4b49798b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -37,7 +37,6 @@ issues:
     - path: pkg/tests
       linters:
         - lll
-        - paralleltest
     - path: pkg/pf/tests
       linters:
         - lll
diff --git a/pkg/tests/.golangci.yml b/pkg/tests/.golangci.yml
deleted file mode 100644
index 664b39b33..000000000
--- a/pkg/tests/.golangci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-run:
-  timeout: 10m
-
-linters:
-  enable-all: false
-  enable:
-    - errcheck
-    - gofmt
-    - gosec
-    - govet
-    - ineffassign
-    - gosimple
-    - staticcheck
-    - unused
-    - misspell
-    - nakedret
-    - nolintlint
-    - revive
-    - unconvert
-    - unused
-
-issues:
-  exclude:
-    - "unused-parameter: parameter"
-    - "redefines-builtin-id:"
diff --git a/pkg/tests/acc_provider_config_test.go b/pkg/tests/acc_provider_config_test.go
index ad231e152..a1738cd2c 100644
--- a/pkg/tests/acc_provider_config_test.go
+++ b/pkg/tests/acc_provider_config_test.go
@@ -24,6 +24,8 @@ import (
 )
 
 func TestAccProviderConfig(t *testing.T) {
+	t.Parallel()
+
 	opts := accTestOptions(t).With(integration.ProgramTestOptions{
 		Dir: "provider-config",
 		ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
diff --git a/pkg/tests/acc_secrets_test.go b/pkg/tests/acc_secrets_test.go
index 0bfc259ed..dfcc9da5a 100644
--- a/pkg/tests/acc_secrets_test.go
+++ b/pkg/tests/acc_secrets_test.go
@@ -33,6 +33,7 @@ import (
 )
 
 func TestAccProviderSecrets(t *testing.T) {
+	t.Parallel()
 	opts := accTestOptions(t).With(integration.ProgramTestOptions{
 		Dir: "provider-secrets",
 
@@ -63,6 +64,8 @@ func TestAccProviderSecrets(t *testing.T) {
 // This tests exercise the bridge and Pulumi CLI together intentionally as secret handling for nested properties
 // historically had some quirks in the Pulumi CLI.
 func TestAccProviderConfigureSecrets(t *testing.T) {
+	t.Parallel()
+
 	type configSetter func(ctx context.Context, t *testing.T, stack *auto.Stack, basePath string, secret bool)
 
 	type primType struct {
@@ -423,6 +426,8 @@ func TestAccProviderConfigureSecrets(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
 			ctx := context.Background()
 			res := &schema.Resource{
 				Schema: map[string]*schema.Schema{
diff --git a/pkg/tests/detailed_diff_unknown_test.go b/pkg/tests/detailed_diff_unknown_test.go
index 87c0c6bc2..34622f0ef 100644
--- a/pkg/tests/detailed_diff_unknown_test.go
+++ b/pkg/tests/detailed_diff_unknown_test.go
@@ -669,8 +669,8 @@ resources:
 			})
 
 			t.Run("update preview", func(t *testing.T) {
-				t.Parallel()
 				t.Skipf("Skipping this test as it this case is not handled by the TF plugin sdk")
+				t.Parallel()
 				// The TF plugin SDK does not handle removing an input for a computed value, even if the provider implements it.
 				// The plugin SDK always fills an empty Computed property with the value from the state.
 				// Diff in these cases always returns no diff and the old state value is used.
diff --git a/pkg/tests/main_test.go b/pkg/tests/main_test.go
index a494eaabd..150ded5d2 100644
--- a/pkg/tests/main_test.go
+++ b/pkg/tests/main_test.go
@@ -34,6 +34,10 @@ func TestMain(m *testing.M) {
 	if err := setupIntegrationTests(); err != nil {
 		log.Fatal(err)
 	}
+	err := os.Setenv("PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION", "true")
+	if err != nil {
+		os.Exit(1)
+	}
 
 	exitCode := m.Run()
 	fmt.Fprintf(os.Stderr, "test main exited with code %d\n", exitCode)