diff --git a/testing/btest/Baseline/language.expire_subnet/output b/testing/btest/Baseline/language.expire_subnet/output
index 9bb289af0c..5557d41190 100644
--- a/testing/btest/Baseline/language.expire_subnet/output
+++ b/testing/btest/Baseline/language.expire_subnet/output
@@ -15,11 +15,11 @@ Accessed table nums: two; three
 Accessed table nets: two; zero, three
 Time: 7.0 secs 518.0 msecs 828.15361 usecs
 
+Expired Subnet: 192.168.4.0/24 --> four at 8.0 secs 835.0 msecs 30.078888 usecs
+Expired Subnet: 192.168.1.0/24 --> one at 8.0 secs 835.0 msecs 30.078888 usecs
 Expired Num: 4 --> four at 8.0 secs 835.0 msecs 30.078888 usecs
 Expired Num: 1 --> one at 8.0 secs 835.0 msecs 30.078888 usecs
 Expired Num: 0 --> zero at 8.0 secs 835.0 msecs 30.078888 usecs
-Expired Subnet: 192.168.4.0/24 --> four at 8.0 secs 835.0 msecs 30.078888 usecs
-Expired Subnet: 192.168.1.0/24 --> one at 8.0 secs 835.0 msecs 30.078888 usecs
 Expired Subnet: 192.168.0.0/16 --> zero at 15.0 secs 150.0 msecs 681.018829 usecs
 Expired Subnet: 192.168.3.0/24 --> three at 15.0 secs 150.0 msecs 681.018829 usecs
 Expired Subnet: 192.168.2.0/24 --> two at 15.0 secs 150.0 msecs 681.018829 usecs
diff --git a/testing/btest/Traces/snmp/leak_test.pcap b/testing/btest/Traces/snmp/leak_test.pcap
new file mode 100644
index 0000000000..0abdc0a6a4
Binary files /dev/null and b/testing/btest/Traces/snmp/leak_test.pcap differ
diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek
index 2ff506b39f..b3aa5344f2 100644
--- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek
@@ -21,7 +21,7 @@ redef Cluster::nodes = {
 @TEST-END-FILE
 
 redef Log::default_rotation_interval = 0secs;
-#redef exit_only_after_terminate = T;
+redef exit_only_after_terminate = T;
 
 @load base/frameworks/netcontrol
 
@@ -75,5 +75,9 @@ event NetControl::rule_added(r: NetControl::Rule, p: NetControl::PluginState, ms
 event NetControl::rule_destroyed(r: NetControl::Rule)
 	{
 	if ( r$entity?$ip )
+		{
 		print "Rule destroyed", r$id, r$cid, |NetControl::find_rules_subnet(r$entity$ip)|;
+		if ( Cluster::local_node_type() == Cluster::WORKER )
+			schedule 2sec { terminate_me() };
+		}
 	}