diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1..stdout
index 066eb59f96..3b0d16d992 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1..stdout
@@ -1,5 +1,3 @@
-Node up, worker-1
 option changed, testcount, 1, 
 option changed, testport, 44/tcp, 
 option changed, teststring, b, comment
-Node up, worker-2
diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.bad_patterns/.stderr b/testing/btest/Baseline/scripts.base.frameworks.input.bad_patterns/out
similarity index 96%
rename from testing/btest/Baseline/scripts.base.frameworks.input.bad_patterns/.stderr
rename to testing/btest/Baseline/scripts.base.frameworks.input.bad_patterns/out
index 06ec4e063e..77892ead1a 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.input.bad_patterns/.stderr
+++ b/testing/btest/Baseline/scripts.base.frameworks.input.bad_patterns/out
@@ -6,4 +6,3 @@ warning: input.log/Input::READER_ASCII: String 'this is not a pattern' contained
 warning: input.log/Input::READER_ASCII: Could not convert line '4	this is not a pattern' of input.log to Val. Ignoring line.
 warning: input.log/Input::READER_ASCII: String '/5' contained no parseable pattern.
 warning: input.log/Input::READER_ASCII: Could not convert line '5	/5' of input.log to Val. Ignoring line.
-received termination signal
diff --git a/testing/btest/core/when-interpreter-exceptions.zeek b/testing/btest/core/when-interpreter-exceptions.zeek
index fb6c0d1f3b..ba6c6a1aa6 100644
--- a/testing/btest/core/when-interpreter-exceptions.zeek
+++ b/testing/btest/core/when-interpreter-exceptions.zeek
@@ -1,7 +1,7 @@
 # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks
 # @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" btest-bg-run zeek "zeek -b %INPUT >output 2>&1"
 # @TEST-EXEC: btest-bg-wait 30
-# @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps | $SCRIPTS/diff-sort" btest-diff zeek/output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER="grep -v 'already queued for removal' | $SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps | $SCRIPTS/diff-sort" btest-diff zeek/output
 
 # interpreter exceptions in "when" blocks shouldn't cause termination
 
diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
index b3f1d36219..05ea16112a 100644
--- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
@@ -7,7 +7,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
 @TEST-START-FILE cluster-layout.zeek
diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek
index 23b56c8147..d474d5d346 100644
--- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek
@@ -7,7 +7,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
 @TEST-START-FILE cluster-layout.zeek
diff --git a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek
index 2b450948c6..d01d4be3f1 100644
--- a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek
@@ -9,7 +9,7 @@
 # @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff proxy-1/.stdout
 # @TEST-EXEC: btest-diff proxy-2/.stdout
diff --git a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
index da32c25dd0..101e61b154 100644
--- a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
@@ -7,7 +7,7 @@
 # @TEST-EXEC: btest-bg-run logger-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff logger-1/test.log
 # @TEST-EXEC: btest-diff logger-2/test.log
 
diff --git a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek
index 5ddebf149b..d625754a57 100644
--- a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek
@@ -6,7 +6,7 @@
 # @TEST-EXEC: sleep 1
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 15
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff worker-1/.stdout
 # @TEST-EXEC: btest-diff worker-2/.stdout
diff --git a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek
index dda06e987a..c62364b02e 100644
--- a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek
+++ b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek
@@ -3,11 +3,9 @@
 # @TEST-PORT: BROKER_PORT3
 #
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: sleep 1
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: sleep 15
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 15
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff worker-1/.stdout
 # @TEST-EXEC: btest-diff worker-2/.stdout
@@ -37,11 +35,6 @@ export {
 
 global n = 0;
 
-event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
-	{
-	terminate();
-	}
-
 global ready_for_data: event();
 
 event zeek_init()
@@ -64,23 +57,16 @@ event ready_for_data()
 	}
 @endif
 
-event die()
-	{
-	terminate();
-	}
-
-@if ( Cluster::is_enabled() && Cluster::local_node_type() == Cluster::MANAGER )
-event Cluster::node_up(name: string, id: string)
-	{
-		print "Node up", name;
-		if ( name == "worker-2" )
-		schedule 5sec { die() };
-	}
-@endif
+global option_changed_count = 0;
 
 function option_changed(ID: string, new_value: any, location: string): any
 	{
+	++option_changed_count;
 	print "option changed", ID, new_value, location;
+
+	if ( Cluster::node == "worker-2" && option_changed_count == 3 )
+		terminate();
+
 	return new_value;
 	}
 
diff --git a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
index 728c026d73..78aa916408 100644
--- a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
+++ b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
@@ -2,7 +2,7 @@
 #
 # @TEST-EXEC: btest-bg-run controllee  ZEEKPATH=$ZEEKPATH:.. zeek -Bbroker %INPUT frameworks/control/controllee Broker::default_port=$BROKER_PORT
 # @TEST-EXEC: btest-bg-run controller  ZEEKPATH=$ZEEKPATH:.. zeek -Bbroker %INPUT test-redef frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=configuration_update
-# @TEST-EXEC: btest-bg-wait 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff controllee/.stdout
 
 const test_var = "ORIGINAL VALUE (this should be printed out first)" &redef;
diff --git a/testing/btest/scripts/base/frameworks/control/id_value.zeek b/testing/btest/scripts/base/frameworks/control/id_value.zeek
index 2e60957f31..9bedd22aff 100644
--- a/testing/btest/scripts/base/frameworks/control/id_value.zeek
+++ b/testing/btest/scripts/base/frameworks/control/id_value.zeek
@@ -2,7 +2,7 @@
 #
 # @TEST-EXEC: btest-bg-run controllee  ZEEKPATH=$ZEEKPATH:.. zeek %INPUT only-for-controllee frameworks/control/controllee Broker::default_port=$BROKER_PORT
 # @TEST-EXEC: btest-bg-run controller  ZEEKPATH=$ZEEKPATH:.. zeek %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=id_value Control::arg=test_var
-# @TEST-EXEC: btest-bg-wait -k 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff controller/.stdout
 
 # This value shouldn't ever be printed to the controllers stdout.
@@ -14,13 +14,8 @@ const test_var = "Original value" &redef;
 redef test_var = "This is the value from the controllee";
 @TEST-END-FILE
 
-event die()
-	{
-	terminate();
-	}
-
 event Control::id_value_response(id: string, val: string)
 	{
 	print fmt("Got an id_value_response(%s, %s) event", id, val);
-	schedule 2sec { die() };
+	terminate();
 	}
diff --git a/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek b/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek
index 23d25b516b..cd8d3483b6 100644
--- a/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek
+++ b/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek
@@ -1,5 +1,6 @@
 # @TEST-EXEC: zeek -b %INPUT
-# @TEST-EXEC: btest-diff .stderr
+# @TEST-EXEC: grep -v "already queued for removal" .stderr > out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
 
 @TEST-START-FILE input.log
 #separator \x09
@@ -12,8 +13,6 @@
 5	/5
 @TEST-END-FILE
 
-redef exit_only_after_terminate = T;
-
 module A;
 
 type Idx: record {
@@ -24,15 +23,9 @@ type Val: record {
 	p: pattern;
 };
 
-event kill_me()
-	{
-	terminate();
-	}
-
 global pats: table[int] of Val = table();
 
 event zeek_init()
 	{
 	Input::add_table([$source="input.log", $name="pats", $idx=Idx, $val=Val, $destination=pats]);
-	schedule 10msec { kill_me() };
 	}
diff --git a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek
index 810aa96c6a..06dcc57fef 100644
--- a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek
+++ b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek
@@ -1,8 +1,8 @@
 # @TEST-EXEC: mv input1.log input.log
 # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got1 5 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got1 15|| (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv input2.log input.log
-# @TEST-EXEC: btest-bg-wait 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff out
 
 @TEST-START-FILE input1.log
diff --git a/testing/btest/scripts/base/frameworks/input/invalidtext.zeek b/testing/btest/scripts/base/frameworks/input/invalidtext.zeek
index 2c2809861a..36c0aa3379 100644
--- a/testing/btest/scripts/base/frameworks/input/invalidtext.zeek
+++ b/testing/btest/scripts/base/frameworks/input/invalidtext.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
-# @TEST-EXEC: btest-bg-wait 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
 # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline
diff --git a/testing/btest/scripts/base/frameworks/input/missing-file.zeek b/testing/btest/scripts/base/frameworks/input/missing-file.zeek
index f1d4a203e2..575a6ff330 100644
--- a/testing/btest/scripts/base/frameworks/input/missing-file.zeek
+++ b/testing/btest/scripts/base/frameworks/input/missing-file.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
-# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: btest-bg-wait 20
 # @TEST-EXEC: btest-diff zeek/.stderr
 
 redef exit_only_after_terminate = T;
@@ -25,3 +25,9 @@ event zeek_init()
 	outfile = open("../out");
 	Input::add_event([$source="does-not-exist.dat", $name="input", $fields=Val, $ev=line, $want_record=F]);
 	}
+
+event reporter_error(t: time, msg: string, location: string)
+	{
+	if ( /terminating thread/ in msg )
+		terminate();
+	}
diff --git a/testing/btest/scripts/base/frameworks/input/reread.zeek b/testing/btest/scripts/base/frameworks/input/reread.zeek
index ca98c9f214..3d1b4c6734 100644
--- a/testing/btest/scripts/base/frameworks/input/reread.zeek
+++ b/testing/btest/scripts/base/frameworks/input/reread.zeek
@@ -1,14 +1,14 @@
 # @TEST-EXEC: mv input1.log input.log
 # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got1 5 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got1 15 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv input2.log input.log
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 5 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 15 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv input3.log input.log
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got3 5 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got3 15 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv input4.log input.log
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got4 5 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got4 15 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv input5.log input.log
-# @TEST-EXEC: btest-bg-wait 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff out
 
 @TEST-START-FILE input1.log
diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek
index 174f07b478..98a43620eb 100644
--- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek
@@ -7,7 +7,7 @@
 # @TEST-EXEC: btest-bg-run proxy-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout
diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek
index 8e093330c2..dcc1d787c7 100644
--- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout
diff --git a/testing/btest/scripts/base/frameworks/intel/expire-item.zeek b/testing/btest/scripts/base/frameworks/intel/expire-item.zeek
index 8f493947fa..631d9bbc50 100644
--- a/testing/btest/scripts/base/frameworks/intel/expire-item.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/expire-item.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 21
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: cat zeekproc/intel.log > output
 # @TEST-EXEC: cat zeekproc/.stdout >> output
 # @TEST-EXEC: btest-diff output
diff --git a/testing/btest/scripts/base/frameworks/intel/filter-item.zeek b/testing/btest/scripts/base/frameworks/intel/filter-item.zeek
index 3c5db1147e..ea97b74350 100644
--- a/testing/btest/scripts/base/frameworks/intel/filter-item.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/filter-item.zeek
@@ -1,6 +1,6 @@
 
 # @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: btest-diff zeekproc/intel.log
 
 @TEST-START-FILE intel.dat
diff --git a/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek b/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek
index f0f5e59511..f4408e689f 100644
--- a/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek
@@ -1,6 +1,6 @@
 
 # @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: btest-diff zeekproc/intel.log
 
 @TEST-START-FILE intel.dat
diff --git a/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek b/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek
index ab6399f45b..116d4f7fc7 100644
--- a/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: cat zeekproc/intel.log > output
 # @TEST-EXEC: cat zeekproc/.stdout >> output
 # @TEST-EXEC: btest-diff output
diff --git a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek
index a0140aa316..18d4dd6515 100644
--- a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff manager-1/intel.log
 # @TEST-EXEC: btest-diff worker-1/.stdout
@@ -53,6 +53,11 @@ event zeek_init()
 		schedule 2sec { do_it() };
 	}
 
+event do_terminate()
+	{
+	terminate();
+	}
+
 global intel_hits=0;
 event Intel::log_intel(rec: Intel::Info)
 	{
@@ -62,6 +67,11 @@ event Intel::log_intel(rec: Intel::Info)
 		{
 		# We're delaying shutdown for a second here to make sure that no other
 		# matches happen (which would be wrong!).
-		schedule 1sec { Control::shutdown_request() };
+		schedule 1sec { do_terminate() };
 		}
 	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
diff --git a/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek b/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek
index cc14dc3dfc..ceb216f021 100644
--- a/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: cat zeekproc/reporter.log > output
 # @TEST-EXEC: cat zeekproc/.stdout >> output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff output
diff --git a/testing/btest/scripts/base/frameworks/intel/updated-match.zeek b/testing/btest/scripts/base/frameworks/intel/updated-match.zeek
index 75a272773d..eadb90047e 100644
--- a/testing/btest/scripts/base/frameworks/intel/updated-match.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/updated-match.zeek
@@ -1,10 +1,10 @@
 # @TEST-EXEC: cp intel1.dat intel.dat
 # @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeekproc/got1 5 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeekproc/got1 15 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cp intel2.dat intel.dat
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeekproc/got2 5 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeekproc/got2 15 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cp intel3.dat intel.dat
-# @TEST-EXEC: btest-bg-wait 10
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: cat zeekproc/intel.log > output
 # @TEST-EXEC: cat zeekproc/notice.log >> output
 # @TEST-EXEC: btest-diff output
diff --git a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
index a1f88a3367..965fc7c646 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT 
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
 @TEST-START-FILE cluster-layout.zeek
diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek
index a1223b4395..ca0ca3da82 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 15
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
 @TEST-START-FILE cluster-layout.zeek
diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek
index 9ccb24f980..acf567bd56 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 15
+# @TEST-EXEC: btest-bg-wait 45
 
 # @TEST-EXEC: btest-diff manager-1/.stdout
 #
diff --git a/testing/btest/scripts/policy/frameworks/intel/removal.zeek b/testing/btest/scripts/policy/frameworks/intel/removal.zeek
index fe2938e711..a296a132dd 100644
--- a/testing/btest/scripts/policy/frameworks/intel/removal.zeek
+++ b/testing/btest/scripts/policy/frameworks/intel/removal.zeek
@@ -1,6 +1,6 @@
 
 # @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: btest-bg-wait 20
 # @TEST-EXEC: btest-diff zeekproc/intel.log
 
 @TEST-START-FILE intel.dat
diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek
index c0e83f08ed..e43c93d6bb 100644
--- a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek
+++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 45
 
 # @TEST-EXEC: btest-diff manager-1/weird_stats.log
 
diff --git a/testing/btest/supervisor/config-cluster.zeek b/testing/btest/supervisor/config-cluster.zeek
index 6f8d290e0d..5be2f927ae 100644
--- a/testing/btest/supervisor/config-cluster.zeek
+++ b/testing/btest/supervisor/config-cluster.zeek
@@ -4,7 +4,7 @@
 # @TEST-PORT: PROXY_PORT
 # @TEST-PORT: WORKER_PORT
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/manager/stdout
 # @TEST-EXEC: btest-diff zeek/logger-1/stdout
diff --git a/testing/btest/supervisor/config-directory.zeek b/testing/btest/supervisor/config-directory.zeek
index bcf9ebd69f..e2320d4bb5 100644
--- a/testing/btest/supervisor/config-directory.zeek
+++ b/testing/btest/supervisor/config-directory.zeek
@@ -1,6 +1,6 @@
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/qux/node.out
 
diff --git a/testing/btest/supervisor/config-output-redirect.zeek b/testing/btest/supervisor/config-output-redirect.zeek
index 78a8d3d6ad..ab447a52c2 100644
--- a/testing/btest/supervisor/config-output-redirect.zeek
+++ b/testing/btest/supervisor/config-output-redirect.zeek
@@ -1,6 +1,6 @@
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/qux/grault.stdout
 # @TEST-EXEC: btest-diff zeek/qux/grault.stderr
diff --git a/testing/btest/supervisor/config-scripts.zeek b/testing/btest/supervisor/config-scripts.zeek
index beeaa567f5..e29a59d0eb 100644
--- a/testing/btest/supervisor/config-scripts.zeek
+++ b/testing/btest/supervisor/config-scripts.zeek
@@ -1,6 +1,6 @@
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/node.out
 
diff --git a/testing/btest/supervisor/create.zeek b/testing/btest/supervisor/create.zeek
index 3455d63f12..6e4bfe518d 100644
--- a/testing/btest/supervisor/create.zeek
+++ b/testing/btest/supervisor/create.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/node.out
 
diff --git a/testing/btest/supervisor/destroy.zeek b/testing/btest/supervisor/destroy.zeek
index 233870b5dc..c7bc6716d4 100644
--- a/testing/btest/supervisor/destroy.zeek
+++ b/testing/btest/supervisor/destroy.zeek
@@ -1,6 +1,6 @@
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/node.out
 
diff --git a/testing/btest/supervisor/restart.zeek b/testing/btest/supervisor/restart.zeek
index e9ddeed97d..9f2a781a85 100644
--- a/testing/btest/supervisor/restart.zeek
+++ b/testing/btest/supervisor/restart.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/.stdout
 
 # So the supervised node doesn't terminate right away.
diff --git a/testing/btest/supervisor/revive-leaf.zeek b/testing/btest/supervisor/revive-leaf.zeek
index 448970283b..7a2306699e 100644
--- a/testing/btest/supervisor/revive-leaf.zeek
+++ b/testing/btest/supervisor/revive-leaf.zeek
@@ -1,6 +1,6 @@
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/node.out
 
diff --git a/testing/btest/supervisor/revive-stem.zeek b/testing/btest/supervisor/revive-stem.zeek
index 37dc3e5053..3003c135f6 100644
--- a/testing/btest/supervisor/revive-stem.zeek
+++ b/testing/btest/supervisor/revive-stem.zeek
@@ -1,6 +1,6 @@
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/supervisor.out
 # @TEST-EXEC: btest-diff zeek/node.out
 
diff --git a/testing/btest/supervisor/status.zeek b/testing/btest/supervisor/status.zeek
index e9ce4cdeca..4d620ed2fb 100644
--- a/testing/btest/supervisor/status.zeek
+++ b/testing/btest/supervisor/status.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
-# @TEST-EXEC: btest-bg-wait 20
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/.stdout
 
 # So the supervised node doesn't terminate right away.