diff --git a/test-redis.tcl b/test-redis.tcl
index 98f806d6ccf47ac7807ca4cb361b0cb6201821df..1ca5e21acba831c8b4ff96fb9714ade8543ac915 100644
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -533,6 +533,17 @@ proc main {server port} {
     } {{1 2 3} 0}
 
     test {SAVE - make sure there are all the types as values} {
+        # Wait for a background saving in progress to terminate
+        while 1 {
+            set i [$r info]
+            if {[string match {*bgsave_in_progress:1*} $i]} {
+                puts -nonewline "\nWaiting for background save to finish... "
+                flush stdout
+                after 100
+            } else {
+                break
+            }
+        }
         $r lpush mysavelist hello
         $r lpush mysavelist world
         $r set myemptykey {}