diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java
index 2fe7a787e0..72ff42ff74 100644
--- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java
+++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java
@@ -145,5 +145,10 @@ public class RedisClient {
             log.error("Exception caught in flushAll", ex);
         }
     }
+    
+    public void destroyInstance() {
+        jedisPool = null;
+        instance = null;
+    }
 
 }
diff --git a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java
index c24b88e20c..9bf0b2b086 100644
--- a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java
+++ b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java
@@ -25,13 +25,14 @@ public class NaiveApproachIntegrationTest {
         s.close();
 
         redisServer = new RedisServer(port);
-        redisServer.start();
     }
 
     @AfterClass
     public static void destroy() {
-        if (redisServer.isActive())
+        if (redisServer.isActive()) {
             redisServer.stop();
+            redisClient.destroyInstance();
+        }
     }
 
     @Before
diff --git a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java
index 828b7a3183..9bde969b58 100644
--- a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java
+++ b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java
@@ -32,13 +32,14 @@ public class ScanStrategyIntegrationTest {
         s.close();
 
         redisServer = new RedisServer(port);
-        redisServer.start();
     }
 
     @AfterClass
     public static void destroy() {
-        if (redisServer.isActive())
+        if (redisServer.isActive()) {
             redisServer.stop();
+            redisClient.destroyInstance();
+        }
     }
 
     @Before