diff --git a/test/fuse_integration/framework.go b/test/fuse_integration/framework.go
index 4505f8c1f7..82a566af76 100644
--- a/test/fuse_integration/framework.go
+++ b/test/fuse_integration/framework.go
@@ -90,6 +90,7 @@ func (f *FuseTestFramework) Setup(config *TestConfig) error {
 	if config != nil {
 		f.config = config
 	}
+	config = f.config
 
 	// Check if we should skip cluster setup and use existing mount
 	if os.Getenv("TEST_SKIP_CLUSTER_SETUP") == "true" {
@@ -206,6 +207,7 @@ func (f *FuseTestFramework) Cleanup() {
 	if f.externalMount {
 		if !f.config.SkipCleanup {
 			os.RemoveAll(f.mountPoint)
+			os.RemoveAll(f.tempDir)
 		}
 		return
 	}
diff --git a/test/fuse_integration/framework_test.go b/test/fuse_integration/framework_test.go
index cfb47a5375..23af7e9dd2 100644
--- a/test/fuse_integration/framework_test.go
+++ b/test/fuse_integration/framework_test.go
@@ -137,6 +137,7 @@ func (f *FuseTestFramework) Setup(config *TestConfig) error {
 	if config != nil {
 		f.config = config
 	}
+	config = f.config
 
 	dirs := []string{f.mountPoint, f.logDir, f.dataDir}
 	for _, dir := range dirs {