diff --git a/pkg/cmd/create_test.go b/pkg/cmd/create_test.go
index 103cd3bc0..90ed90eff 100644
--- a/pkg/cmd/create_test.go
+++ b/pkg/cmd/create_test.go
@@ -30,10 +30,9 @@ import (
 )
 
 func TestCreateCmd(t *testing.T) {
+	t.Chdir(t.TempDir())
 	ensure.HelmHome(t)
 	cname := "testchart"
-	dir := t.TempDir()
-	defer t.Chdir(dir)
 
 	// Run a create
 	if _, _, err := executeActionCommand("create " + cname); err != nil {
@@ -61,12 +60,10 @@ func TestCreateCmd(t *testing.T) {
 }
 
 func TestCreateStarterCmd(t *testing.T) {
+	t.Chdir(t.TempDir())
 	ensure.HelmHome(t)
 	cname := "testchart"
 	defer resetEnv()()
-	os.MkdirAll(helmpath.CachePath(), 0o755)
-	defer t.Chdir(helmpath.CachePath())
-
 	// Create a starter.
 	starterchart := helmpath.DataPath("starters")
 	os.MkdirAll(starterchart, 0o755)
@@ -125,6 +122,7 @@ func TestCreateStarterCmd(t *testing.T) {
 }
 
 func TestCreateStarterAbsoluteCmd(t *testing.T) {
+	t.Chdir(t.TempDir())
 	defer resetEnv()()
 	ensure.HelmHome(t)
 	cname := "testchart"
@@ -142,9 +140,6 @@ func TestCreateStarterAbsoluteCmd(t *testing.T) {
 		t.Fatalf("Could not write template: %s", err)
 	}
 
-	os.MkdirAll(helmpath.CachePath(), 0o755)
-	defer t.Chdir(helmpath.CachePath())
-
 	starterChartPath := filepath.Join(starterchart, "starterchart")
 
 	// Run a create
diff --git a/pkg/cmd/package_test.go b/pkg/cmd/package_test.go
index b17684aa6..db4a2523a 100644
--- a/pkg/cmd/package_test.go
+++ b/pkg/cmd/package_test.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 	"testing"
 
+	"helm.sh/helm/v4/internal/test/ensure"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
@@ -110,8 +111,8 @@ func TestPackage(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cachePath := t.TempDir()
-			defer t.Chdir(cachePath)
+			t.Chdir(t.TempDir())
+			ensure.HelmHome(t)
 
 			if err := os.MkdirAll("toot", 0o777); err != nil {
 				t.Fatal(err)