diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
index 385b1c0..597e305 100644
--- a/src/main/java/redis/clients/jedis/BinaryJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -2860,6 +2860,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey
      */
     public void monitor(final JedisMonitor jedisMonitor) {
 	client.monitor();
+	client.getStatusCodeReply();
 	jedisMonitor.proceed(client);
     }
 
diff --git a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
index 4ae64df..00612bb 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
@@ -45,18 +45,8 @@ public class ControlCommandsTest extends JedisCommandTestBase {
 
     @Test
     public void lastsave() throws InterruptedException {
-	long before = jedis.lastsave();
-	String st = "";
-	while (!st.equals("OK")) {
-	    try {
-		Thread.sleep(1000);
-		st = jedis.save();
-	    } catch (JedisDataException e) {
-
-	    }
-	}
-	long after = jedis.lastsave();
-	assertTrue((after - before) > 0);
+	long saved = jedis.lastsave();
+	assertTrue(saved > 0);
     }
 
     @Test
@@ -73,14 +63,9 @@ public class ControlCommandsTest extends JedisCommandTestBase {
 	    public void run() {
 		Jedis j = new Jedis("localhost");
 		j.auth("foobared");
-		for (int i = 0; i < 4; i++) {
+		for (int i = 0; i < 5; i++) {
 		    j.incr("foobared");
 		}
-		try {
-		    Thread.sleep(2500);
-		} catch (InterruptedException e) {
-		}
-		j.incr("foobared");
 		j.disconnect();
 	    }
 	}).start();