diff --git a/testing/btest/Baseline/scripts.base.utils.active-http/bro..stdout b/testing/btest/Baseline/scripts.base.utils.active-http/bro..stdout
index 0284eb19b3..eac07da9a8 100644
--- a/testing/btest/Baseline/scripts.base.utils.active-http/bro..stdout
+++ b/testing/btest/Baseline/scripts.base.utils.active-http/bro..stdout
@@ -1,4 +1,9 @@
-[code=200, msg=OK^M, body=It works!, headers={
+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 442d5b9e06..b910ea1c7e 100644
--- a/testing/btest/scripts/base/utils/active-http.test
+++ b/testing/btest/scripts/base/utils/active-http.test
@@ -1,7 +1,7 @@
 # @TEST-REQUIRES: which python
 # @TEST-REQUIRES: which curl
 #
-# @TEST-EXEC: btest-bg-run httpd python $SCRIPTS/httpd.py --max 1 --addr=127.0.0.1
+# @TEST-EXEC: btest-bg-run httpd python $SCRIPTS/httpd.py --max 2 --addr=127.0.0.1
 # @TEST-EXEC: sleep 3
 # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
 # @TEST-EXEC: btest-bg-wait 15
@@ -11,18 +11,32 @@
 @load base/frameworks/communication # let network-time run. otherwise there are no heartbeats...
 redef exit_only_after_terminate = T;
 
-event bro_init()
-	{
-	local req = ActiveHTTP::Request($url="127.0.0.1:32123");
+global c: count = 0;
 
-	when ( local resp = ActiveHTTP::request(req) )
-		{
-		print resp;
+function check_exit_condition()
+	{
+	c += 1;
+
+	if ( c == 2 )
 		terminate();
+	}
+
+function test_request(label: string, req: ActiveHTTP::Request)
+	{
+	when ( local response = ActiveHTTP::request(req) )
+		{
+		print label, response;
+		check_exit_condition();
 		}
 	timeout 1min
 		{
 		print "HTTP request timeout";
-		terminate();
+		check_exit_condition();
 		}
 	}
+
+event bro_init()
+	{
+	test_request("test1", [$url="127.0.0.1:32123"]);
+	test_request("test2", [$url="127.0.0.1:32123/empty", $method="POST"]);
+	}