diff --git a/aux/btest b/aux/btest
index 6c0f099c52..ba0700fe44 160000
--- a/aux/btest
+++ b/aux/btest
@@ -1 +1 @@
-Subproject commit 6c0f099c52f9e7b5d6f3efafb63581a6cc0861a5
+Subproject commit ba0700fe448895b654b90d50f389f6f1341234cb
diff --git a/src/main.cc b/src/main.cc
index 59cdb23241..aae382ad87 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1055,7 +1055,7 @@ int main(int argc, char** argv)
 
 	io_sources.Register(thread_mgr, true);
 
-	if ( io_sources.Size() > 0 || have_pending_timers )
+	if ( io_sources.Size() > 0 || have_pending_timers || BifConst::exit_only_after_terminate )
 		{
 		if ( profiling_logger )
 			profiling_logger->Log();