diff --git a/CHANGES b/CHANGES
index 2e44cadda1..1d18df4254 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.5-994 | 2018-09-10 19:47:03 -0500
+
+  * Try to fix a rare broker test instability (Jon Siwek, Corelight)
+
+  * Fix invalid memory free when using Log::default_field_name_map (Jon Siwek, Corelight)
+
 2.5-992 | 2018-09-10 18:34:09 -0500
 
   * Stabilize a unit test. (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index c182fe471a..7df0fdb36b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-992
+2.5-994
diff --git a/testing/btest/broker/disconnect.bro b/testing/btest/broker/disconnect.bro
index 3daed6a6b7..7eafe0b67f 100644
--- a/testing/btest/broker/disconnect.bro
+++ b/testing/btest/broker/disconnect.bro
@@ -3,10 +3,7 @@
 # @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out"
 # @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out"
 
-# @TEST-EXEC: $SCRIPTS/wait-for-file recv/got-event 30 || (btest-bg-wait -k 1 && false)
-# @TEST-EXEC: kill $(cat recv/.pid)
-# @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat recv/.pid) 10 || (btest-bg-wait -k 1 && false)
-# @TEST-EXEC: echo 0 >recv/.exitcode
+# @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat recv/.pid) 30 || (btest-bg-wait -k 1 && false)
 
 # @TEST-EXEC: btest-bg-run recv2 "bro -B broker -b ../recv.bro >recv2.out"
 # @TEST-EXEC: btest-bg-wait 30
@@ -60,12 +57,7 @@ const test_topic = "bro/test/my_topic";
 event my_event(i: count)
 	{
 	print "receiver got event", i;
-
-	if ( i == 1 )
-		# In the first case, terminate via `kill` from btest command.
-		system("touch got-event");
-	else
-		terminate();
+	terminate();
 	}
 
 event bro_init()