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 fbc7d8e..4ae64df 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
@@ -12,114 +12,119 @@ import redis.clients.jedis.exceptions.JedisDataException;
 public class ControlCommandsTest extends JedisCommandTestBase {
     @Test
     public void save() {
-        String status = jedis.save();
-        assertEquals("OK", status);
+	try {
+	    String status = jedis.save();
+	    assertEquals("OK", status);
+	} catch (JedisDataException e) {
+	    assertTrue("ERR Background save already in progress"
+		    .equalsIgnoreCase(e.getMessage()));
+	}
     }
 
     @Test
     public void bgsave() {
-        try {
-            String status = jedis.bgsave();
-            assertEquals("Background saving started", status);
-        } catch (JedisDataException e) {
-            assertTrue("ERR Background save already in progress"
-                    .equalsIgnoreCase(e.getMessage()));
-        }
+	try {
+	    String status = jedis.bgsave();
+	    assertEquals("Background saving started", status);
+	} catch (JedisDataException e) {
+	    assertTrue("ERR Background save already in progress"
+		    .equalsIgnoreCase(e.getMessage()));
+	}
     }
 
     @Test
     public void bgrewriteaof() {
-    	String scheduled = "Background append only file rewriting scheduled";
-        String started = "Background append only file rewriting started";
-        
-        String status = jedis.bgrewriteaof();
-        
-        boolean ok = status.equals(scheduled) || status.equals(started);  
-        assertTrue(ok);
+	String scheduled = "Background append only file rewriting scheduled";
+	String started = "Background append only file rewriting started";
+
+	String status = jedis.bgrewriteaof();
+
+	boolean ok = status.equals(scheduled) || status.equals(started);
+	assertTrue(ok);
     }
 
     @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 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 after = jedis.lastsave();
+	assertTrue((after - before) > 0);
     }
 
     @Test
     public void info() {
-        String info = jedis.info();
-        assertNotNull(info);
-        info = jedis.info("server");
-        assertNotNull(info);
+	String info = jedis.info();
+	assertNotNull(info);
+	info = jedis.info("server");
+	assertNotNull(info);
     }
 
     @Test
     public void monitor() {
-        new Thread(new Runnable() {
-            public void run() {
-                Jedis j = new Jedis("localhost");
-                j.auth("foobared");
-                for (int i = 0; i < 4; i++) {
-                    j.incr("foobared");
-                }
-                try {
-                    Thread.sleep(2500);
-                } catch (InterruptedException e) {
-                }
-                j.incr("foobared");
-                j.disconnect();
-            }
-        }).start();
+	new Thread(new Runnable() {
+	    public void run() {
+		Jedis j = new Jedis("localhost");
+		j.auth("foobared");
+		for (int i = 0; i < 4; i++) {
+		    j.incr("foobared");
+		}
+		try {
+		    Thread.sleep(2500);
+		} catch (InterruptedException e) {
+		}
+		j.incr("foobared");
+		j.disconnect();
+	    }
+	}).start();
 
-        jedis.monitor(new JedisMonitor() {
-            private int count = 0;
+	jedis.monitor(new JedisMonitor() {
+	    private int count = 0;
 
-            public void onCommand(String command) {
-                if (command.contains("INCR")) {
-                    count++;
-                }
-                if (count == 5) {
-                    client.disconnect();
-                }
-            }
-        });
+	    public void onCommand(String command) {
+		if (command.contains("INCR")) {
+		    count++;
+		}
+		if (count == 5) {
+		    client.disconnect();
+		}
+	    }
+	});
     }
 
     @Test
     public void configGet() {
-        List<String> info = jedis.configGet("m*");
-        assertNotNull(info);
+	List<String> info = jedis.configGet("m*");
+	assertNotNull(info);
     }
 
     @Test
     public void configSet() {
-        List<String> info = jedis.configGet("maxmemory");
-        String memory = info.get(1);
-        String status = jedis.configSet("maxmemory", "200");
-        assertEquals("OK", status);
-        jedis.configSet("maxmemory", memory);
+	List<String> info = jedis.configGet("maxmemory");
+	String memory = info.get(1);
+	String status = jedis.configSet("maxmemory", "200");
+	assertEquals("OK", status);
+	jedis.configSet("maxmemory", memory);
     }
 
     @Test
     public void sync() {
-        jedis.sync();
+	jedis.sync();
     }
 
     @Test
     public void debug() {
-        jedis.set("foo", "bar");
-        String resp = jedis.debug(DebugParams.OBJECT("foo"));
-        assertNotNull(resp);
-        resp = jedis.debug(DebugParams.RELOAD());
-        assertNotNull(resp);
+	jedis.set("foo", "bar");
+	String resp = jedis.debug(DebugParams.OBJECT("foo"));
+	assertNotNull(resp);
+	resp = jedis.debug(DebugParams.RELOAD());
+	assertNotNull(resp);
     }
 }
\ No newline at end of file