diff --git a/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java b/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java
index 28814cc..2973e53 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java
@@ -24,7 +24,7 @@ public abstract class JedisCommandTestBase extends Assert {
 	jedis = new Jedis("localhost", Protocol.DEFAULT_PORT, 500);
 	jedis.connect();
 	jedis.auth("foobared");
-	jedis.flushDB();
+	jedis.flushAll();
     }
 
     @After
diff --git a/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
index 092fbcf..ef6b784 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
@@ -59,8 +59,6 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
     @Test
     public void watch() throws UnknownHostException, IOException {
 	jedis.watch("mykey");
-	String val = jedis.get("mykey");
-	val = "foo";
 	Transaction t = jedis.multi();
 
 	Jedis nj = new Jedis("localhost");
@@ -69,9 +67,10 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
 	nj.set("mykey", "bar");
 	nj.disconnect();
 
-	t.set("mykey", val);
+	t.set("mykey", "foo");
 	List<Object> resp = t.exec();
 	assertEquals(null, resp);
+	assertEquals("bar", jedis.get("mykey"));
     }
 
     @Test