diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 42aaa6ed..fab96c8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -194,7 +194,7 @@ jobs:
             --volume /tmp:/src \
             --entrypoint /src/pulumi-test-containers \
             ${{ env.DOCKER_ORG }}/pulumi-provider-build-environment:${{ env.PULUMI_VERSION }} \
-            -test.parallel=1 -test.timeout=1h -test.v
+            -test.timeout=1h -test.v
 
   base:
     name: Base image
@@ -317,7 +317,7 @@ jobs:
             --entrypoint /src/pulumi-test-containers \
             --platform ${{ matrix.arch }} \
             ${{ env.IMAGE_NAME }} \
-            -test.parallel=1 -test.timeout=1h -test.v -test.run "TestPulumiTemplateTests|TestEnvironment"
+            -test.timeout=1h -test.v
 
   ubi-sdk:
     name: UBI SDK images
@@ -401,4 +401,4 @@ jobs:
             --volume /tmp:/src \
             --entrypoint /src/pulumi-test-containers \
             ${{ env.DOCKER_ORG }}/pulumi-${{ matrix.sdk }}:${{ env.PULUMI_VERSION }}-ubi \
-            -test.parallel=1 -test.timeout=1h -test.v -test.run "TestPulumiTemplateTests|TestEnvironment"
+            -test.timeout=1h -test.v
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b7d6db53..60c7784c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -191,7 +191,7 @@ jobs:
             --volume /tmp:/src \
             --entrypoint /src/pulumi-test-containers \
             ${{ env.DOCKER_ORG }}/pulumi-provider-build-environment:${{ env.PULUMI_VERSION }} \
-            -test.parallel=1 -test.timeout=1h -test.v
+            -test.timeout=1h -test.v
       - name: Push ${{ env.PULUMI_VERSION }}
         run: docker push ${{ env.DOCKER_ORG }}/pulumi-provider-build-environment:${{ env.PULUMI_VERSION }}
       - name: Push latest
@@ -369,7 +369,7 @@ jobs:
             --entrypoint /src/pulumi-test-containers \
             --platform ${{ matrix.arch }} \
             ${{ env.IMAGE_NAME }} \
-            -test.parallel=1 -test.timeout=1h -test.v -test.run "TestPulumiTemplateTests|TestEnvironment"
+            -test.timeout=1h -test.v
       - name: Push image
         run: |
           docker push ${{ env.IMAGE_NAME }}
@@ -528,7 +528,7 @@ jobs:
             --volume /tmp:/src \
             --entrypoint /src/pulumi-test-containers \
             ${{ env.DOCKER_ORG }}/pulumi-${{ matrix.sdk }}:${{ env.PULUMI_VERSION }}-ubi \
-            -test.parallel=1 -test.timeout=1h -test.v -test.run "TestPulumiTemplateTests|TestEnvironment"
+            -test.timeout=1h -test.v
       - name: Push image
         run: |
           docker push ${{ env.DOCKER_ORG }}/pulumi-${{ matrix.sdk }}:${{ env.PULUMI_VERSION }}-ubi
diff --git a/tests/containers_test.go b/tests/containers_test.go
index 8011c75c..1ae2824e 100644
--- a/tests/containers_test.go
+++ b/tests/containers_test.go
@@ -172,7 +172,10 @@ func TestKitchenSinkPythonVersions(t *testing.T) {
 	})
 }
 
-func TestCLIToolTests(t *testing.T) {
+func TestCloudCLIToolTests(t *testing.T) {
+	if !isKitchenSink(t) {
+		t.Skip("Only running Cloud CLI tool tests on kitchen sink")
+	}
 	t.Parallel()
 
 	t.Run("Azure CLI", func(t *testing.T) {
@@ -230,10 +233,10 @@ func TestEnvironment(t *testing.T) {
 	t.Logf("Testing image variant: %s", imageVariant)
 
 	t.Run("Python", func(t *testing.T) {
+		t.Parallel()
 		if !hasPython(t) {
 			t.Skip("Skipping test for images without python")
 		}
-		t.Parallel()
 		expected := "/usr/local/bin/python"
 		if isKitchenSink(t) {
 			expected = "/pyenv/shims/python"
@@ -249,6 +252,7 @@ func TestEnvironment(t *testing.T) {
 	})
 
 	t.Run("Node", func(t *testing.T) {
+		t.Parallel()
 		if !hasNodejs(t) {
 			t.Skip("Skipping test for images without nodejs")
 		}
@@ -256,7 +260,6 @@ func TestEnvironment(t *testing.T) {
 		if isUBI(t) || isKitchenSink(t) {
 			expected = "/usr/bin/node"
 		}
-		t.Parallel()
 		p, err := exec.LookPath("node")
 		require.NoError(t, err)
 		require.Equal(t, expected, p)
@@ -265,6 +268,7 @@ func TestEnvironment(t *testing.T) {
 	})
 
 	t.Run("PATH", func(t *testing.T) {
+		t.Parallel()
 		// Install scripts for various tools can sometimes modify PATH, usually by adding entries
 		// to ~/.bashrc. This test ensures that we notice such modifications.
 		expectedPaths := map[string]string{