diff --git a/CHANGES b/CHANGES
index 7554c9fe88..c363f3c09a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.3-255 | 2014-10-24 13:39:44 -0700
+
+  * Fixing unstable active-http test. (Robin Sommer)
+
 2.3-254 | 2014-10-24 11:40:51 -0700
 
   * Fix active-http.bro to deal reliably with empty server responses,
diff --git a/VERSION b/VERSION
index 6bd8c152a6..b6bf87e070 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-254
+2.3-255
diff --git a/testing/btest/Baseline/scripts.base.utils.active-http/bro..stdout b/testing/btest/Baseline/scripts.base.utils.active-http/bro..stdout
deleted file mode 100644
index eac07da9a8..0000000000
--- a/testing/btest/Baseline/scripts.base.utils.active-http/bro..stdout
+++ /dev/null
@@ -1,10 +0,0 @@
-test1, [code=200, msg=OK^M, body=It works!, headers={
-[Server] =  1.0,
-[Content-type] =  text/plain,
-[Date] =  July 22, 2013
-}]
-test2, [code=200, msg=OK^M, body=, headers={
-[Server] =  1.0,
-[Content-type] =  text/plain,
-[Date] =  July 22, 2013
-}]
diff --git a/testing/btest/scripts/base/utils/active-http.test b/testing/btest/scripts/base/utils/active-http.test
index b910ea1c7e..dbd3fbe141 100644
--- a/testing/btest/scripts/base/utils/active-http.test
+++ b/testing/btest/scripts/base/utils/active-http.test
@@ -5,7 +5,8 @@
 # @TEST-EXEC: sleep 3
 # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
 # @TEST-EXEC: btest-bg-wait 15
-# @TEST-EXEC: btest-diff bro/.stdout
+# @TEST-EXEC: cat bro/.stdout | sort >output
+# @TEST-EXEC: btest-diff output
 
 @load base/utils/active-http
 @load base/frameworks/communication # let network-time run. otherwise there are no heartbeats...