diff --git a/scripts/policy/tuning/logs-to-elasticsearch.bro b/scripts/policy/tuning/logs-to-elasticsearch.bro
index 44fc3800b8..207a9acc04 100644
--- a/scripts/policy/tuning/logs-to-elasticsearch.bro
+++ b/scripts/policy/tuning/logs-to-elasticsearch.bro
@@ -19,6 +19,9 @@ export {
 
 event bro_init() &priority=-5
 	{
+	if ( server_host == "" )
+		return;
+	
 	for ( stream_id in Log::active_streams )
 		{
 		if ( fmt("%s", stream_id) in excluded_log_ids ||
diff --git a/testing/external/scripts/testing-setup.bro b/testing/external/scripts/testing-setup.bro
index fa5664a877..4b4d110864 100644
--- a/testing/external/scripts/testing-setup.bro
+++ b/testing/external/scripts/testing-setup.bro
@@ -1,6 +1,12 @@
 # Sets some testing specific options.
 
 @ifdef ( SMTP::never_calc_md5 )
-        # MDD5s can depend on libmagic output.
+	# MDD5s can depend on libmagic output.
 	redef SMTP::never_calc_md5 = T;
 @endif
+
+@ifdef ( LogElasticSearch::server_host )
+	# Set to empty so that logs-to-elasticsearch.bro doesn't try to setup
+	#log forwarding to ES.
+	redef LogElasticSearch::server_host = "";
+@endif