diff --git a/tests/NRediSearch.Test/RediSearchTestBase.cs b/tests/NRediSearch.Test/RediSearchTestBase.cs
index 8441e01e9..b828584fa 100644
--- a/tests/NRediSearch.Test/RediSearchTestBase.cs
+++ b/tests/NRediSearch.Test/RediSearchTestBase.cs
@@ -15,6 +15,8 @@ protected RediSearchTestBase(ITestOutputHelper output)
             muxer = GetWithFT(output);
             Output = output;
             Db = muxer.GetDatabase();
+            var server = muxer.GetServer(muxer.GetEndPoints()[0]);
+            server.FlushDatabase();
         }
         private ConnectionMultiplexer muxer;
         protected IDatabase Db { get; private set; }
diff --git a/tests/RedisConfigs/docker-compose.yml b/tests/RedisConfigs/docker-compose.yml
index 7de3a72c7..79dcabdf3 100644
--- a/tests/RedisConfigs/docker-compose.yml
+++ b/tests/RedisConfigs/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '2.4'
+version: '2.5'
 
 services:
   redisearch:
-    image: redislabs/redisearch
+    image: redislabs/redisearch:latest
     ports:
       - 6385:6379
   redis: