diff --git a/testing/btest/language/at-if-lambda.zeek b/testing/btest/language/at-if-lambda.zeek
index 887a15c2c7..e8d1133c08 100644
--- a/testing/btest/language/at-if-lambda.zeek
+++ b/testing/btest/language/at-if-lambda.zeek
@@ -9,11 +9,7 @@ event zeek_init()
 	{
 	local make_epoch_result = function(pass_name: string): function(ts: time): time
 		{
-@if ( Version::at_least("4.1") )
 		return function [pass_name] (ts: time): time
-@else
-		return function (ts: time)
-@endif
 			{
 			print pass_name;
 			return ts;
@@ -35,11 +31,7 @@ event zeek_init()
 	{
 	local make_epoch_result = function(pass_name: string): function(ts: time): time
 		{
-@if ( Version::at_least("4.1") )
 		return function [pass_name] (ts: time): time {
-@else
-		return function (ts: time) {
-@endif
 			print pass_name;
 			return ts;
 			};
diff --git a/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek b/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
index 5f021ec746..f5e2366c30 100644
--- a/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
+++ b/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
@@ -9,10 +9,8 @@ event analyzer_violation(c: connection, atype: AllAnalyzers::Tag, aid: count, re
 	print "analyzer_violation", c$id, atype, aid, reason;
 	}
 
-@if ( Version::at_least("5.1") )
 event analyzer_violation_info(tag: AllAnalyzers::Tag, info: AnalyzerViolationInfo)
 	{
 	print "reason", info$reason;
 	print "data", fmt("%s", info$data);
 	}
-@endif
diff --git a/testing/btest/supervisor/config-cluster-pcap.zeek b/testing/btest/supervisor/config-cluster-pcap.zeek
index a373d05702..88130c20f2 100644
--- a/testing/btest/supervisor/config-cluster-pcap.zeek
+++ b/testing/btest/supervisor/config-cluster-pcap.zeek
@@ -1,4 +1,5 @@
 # @TEST-DOC: Test support for pcap_file on Supervisor::ClusterEndpoint and Supervisor::NodeConfig
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 #
 # @TEST-PORT: MANAGER_PORT
 # @TEST-PORT: WORKER_PORT