diff --git a/tests/e2e/homelab_e2e_test.go b/tests/e2e/homelab_e2e_test.go
index 2cefbbf..7db68a6 100644
--- a/tests/e2e/homelab_e2e_test.go
+++ b/tests/e2e/homelab_e2e_test.go
@@ -328,11 +328,11 @@ func TestConfigurationScenariosE2E(t *testing.T) {
 
 		// Backup original configs if they exist
 		if _, err := os.Stat(originalConfigDir); err == nil {
-			if err := os.Rename(originalConfigDir, tempConfigDir); err != nil {
+			if err := tests.CopyDir(originalConfigDir, tempConfigDir); err != nil {
 				t.Fatalf("Failed to backup configs: %v", err)
 			}
 			defer func() {
-				_ = os.Rename(tempConfigDir, originalConfigDir)
+				_ = tests.CopyDir(tempConfigDir, originalConfigDir)
 			}()
 		}
 
diff --git a/tests/fixtures/test_utils.go b/tests/fixtures/test_utils.go
index b679caa..6fd47e9 100644
--- a/tests/fixtures/test_utils.go
+++ b/tests/fixtures/test_utils.go
@@ -128,6 +128,12 @@ func EnsureRedis(t *testing.T) (cleanup func()) {
 
 	// Start temporary Redis
 	t.Logf("Starting temporary Redis on %s", redisAddr)
+
+	// Check if redis-server is available
+	if _, err := exec.LookPath("redis-server"); err != nil {
+		t.Skip("Skipping: redis-server not available in PATH")
+	}
+
 	cmd := exec.CommandContext(
 		context.Background(),
 		"redis-server",