diff --git a/CHANGES b/CHANGES
index c84410303b..b3571cf874 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.3-637 | 2015-03-30 12:02:07 -0500
+
+  * Increase timeout duration in some broker tests. (Jon Siwek)
+
 2.3-636 | 2015-03-30 11:26:32 -0500
 
   * Updates related to SSH analysis. (Jon Siwek)
diff --git a/VERSION b/VERSION
index b7ffdd164c..490e7ba99b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-636
+2.3-637
diff --git a/testing/btest/broker/clone_store.bro b/testing/btest/broker/clone_store.bro
index 769ab8df58..1973595bab 100644
--- a/testing/btest/broker/clone_store.bro
+++ b/testing/btest/broker/clone_store.bro
@@ -4,7 +4,7 @@
 # @TEST-EXEC: btest-bg-run clone "bro -b -r $TRACES/wikipedia.trace ../clone.bro broker_port=$BROKER_PORT >clone.out"
 # @TEST-EXEC: btest-bg-run master "bro -b -r $TRACES/wikipedia.trace ../master.bro broker_port=$BROKER_PORT >master.out"
 
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 60
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff clone/clone.out
 # @TEST-EXEC: btest-diff master/master.out
 
@@ -17,7 +17,7 @@ global h: opaque of BrokerStore::Handle;
 global expected_key_count = 4;
 global key_count = 0;
 
-global query_timeout = 15sec;
+global query_timeout = 30sec;
 
 function do_lookup(key: string)
 	{
diff --git a/testing/btest/broker/master_store.bro b/testing/btest/broker/master_store.bro
index 2672043f62..3863822988 100644
--- a/testing/btest/broker/master_store.bro
+++ b/testing/btest/broker/master_store.bro
@@ -1,7 +1,7 @@
 # @TEST-REQUIRES: grep -q ENABLE_BROKER $BUILD/CMakeCache.txt
 
 # @TEST-EXEC: btest-bg-run master "bro -b -r $TRACES/wikipedia.trace %INPUT >out"
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 60
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff master/out
 
 redef exit_only_after_terminate = T;
@@ -16,7 +16,7 @@ const pop_expect_count = 2;
 
 global test_size: event(where: string &default = "");
 
-global query_timeout = 5sec;
+global query_timeout = 30sec;
 
 event test_clear()
 	{