diff --git a/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java b/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java
index 7ca2a52..b95caf0 100644
--- a/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java
+++ b/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java
@@ -24,15 +24,21 @@ public class SharedJedisPipelineTest {
     @Before
     public void setUp() throws Exception {
         Jedis jedis = new Jedis(redis1.host, redis1.port);
+        jedis.auth("foobared");
         jedis.flushAll();
         jedis.disconnect();
         jedis = new Jedis(redis2.host, redis2.port);
+        jedis.auth("foobared");
         jedis.flushAll();
         jedis.disconnect();
 
+        JedisShardInfo shardInfo1 = new JedisShardInfo(redis1.host, redis1.port);
+        JedisShardInfo shardInfo2 = new JedisShardInfo(redis2.host, redis2.port);
+        shardInfo1.setPassword("foobared");
+        shardInfo2.setPassword("foobared");
         List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
-        shards.add(new JedisShardInfo(redis1.host, redis1.port));
-        shards.add(new JedisShardInfo(redis2.host, redis2.port));
+        shards.add(shardInfo1);
+        shards.add(shardInfo2);
         this.jedis = new ShardedJedis(shards);
     }
 
@@ -46,7 +52,6 @@ public class SharedJedisPipelineTest {
         assertEquals(2, results.size());
         assertEquals("OK", results.get(0));
         assertEquals("bar", results.get(1));
-
     }
 
     @Test
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 c6b6698..7e59335 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
@@ -29,8 +29,13 @@ public class ControlCommandsTest extends JedisCommandTestBase {
 
     @Test
     public void bgrewriteaof() {
+    	String scheduled = "Background append only file rewriting scheduled";
+        String started = "Background append only file rewriting started";
+        
         String status = jedis.bgrewriteaof();
-        assertEquals("Background append only file rewriting started", status);
+        
+        boolean ok = status.equals(scheduled) || status.equals(started);  
+        assertTrue(ok);
     }
 
     @Test