diff --git a/test/extra/crunched_delete.c++ b/test/extra/crunched_delete.c++
index 134dbafe..af2e6fad 100644
--- a/test/extra/crunched_delete.c++
+++ b/test/extra/crunched_delete.c++
@@ -349,12 +349,7 @@ bool simple(mdbx::env env) {
   return true;
 }
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
-  mdbx_setup_debug_nofmt(MDBX_LOG_NOTICE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
-
+int doit() {
   mdbx::path db_filename = "test-crunched-del";
   mdbx::env::remove(db_filename);
 
@@ -392,3 +387,15 @@ int main(int argc, const char *argv[]) {
   std::cout << "OK\n";
   return EXIT_SUCCESS;
 }
+
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  mdbx_setup_debug_nofmt(MDBX_LOG_NOTICE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
diff --git a/test/extra/cursor_closing.c++ b/test/extra/cursor_closing.c++
index 60749dbd..5f575c89 100644
--- a/test/extra/cursor_closing.c++
+++ b/test/extra/cursor_closing.c++
@@ -316,12 +316,7 @@ bool case1(mdbx::env env) {
 
 //--------------------------------------------------------------------------------------------
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
-  mdbx_setup_debug_nofmt(MDBX_LOG_NOTICE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
-
+int doit() {
   mdbx::path db_filename = "test-cursor-closing";
   mdbx::env::remove(db_filename);
 
@@ -339,3 +334,15 @@ int main(int argc, const char *argv[]) {
     return EXIT_FAILURE;
   }
 }
+
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  mdbx_setup_debug_nofmt(MDBX_LOG_NOTICE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
diff --git a/test/extra/dbi.c++ b/test/extra/dbi.c++
index fe238415..9aca25a5 100644
--- a/test/extra/dbi.c++
+++ b/test/extra/dbi.c++
@@ -11,12 +11,7 @@ static void logger_nofmt(MDBX_log_level_t loglevel, const char *function, int li
   fprintf(stdout, "%s:%u %s", function, line, msg);
 }
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
-  mdbx_setup_debug_nofmt(MDBX_LOG_NOTICE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
-
+int doit() {
   mdbx::path db_filename = "test-dbi";
   mdbx::env::remove(db_filename);
 
@@ -71,3 +66,15 @@ int main(int argc, const char *argv[]) {
   std::cout << "OK\n";
   return EXIT_SUCCESS;
 }
+
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  mdbx_setup_debug_nofmt(MDBX_LOG_NOTICE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
diff --git a/test/extra/doubtless_positioning.c++ b/test/extra/doubtless_positioning.c++
index ecc24daa..a7a50e41 100644
--- a/test/extra/doubtless_positioning.c++
+++ b/test/extra/doubtless_positioning.c++
@@ -211,10 +211,7 @@ static bool test(mdbx::txn txn, mdbx::map_handle dbi) {
   return ok;
 }
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
+int doit() {
   mdbx::path db_filename = "test-posi";
   mdbx::env_managed::remove(db_filename);
   mdbx::env_managed env(db_filename, mdbx::env_managed::create_parameters(), mdbx::env::operate_parameters(3));
@@ -243,3 +240,14 @@ int main(int argc, const char *argv[]) {
   std::cout << "OK\n";
   return EXIT_SUCCESS;
 }
+
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
diff --git a/test/extra/dupfix_addodd.c b/test/extra/dupfix_addodd.c
index 7d976f9b..4d79b27e 100644
--- a/test/extra/dupfix_addodd.c
+++ b/test/extra/dupfix_addodd.c
@@ -25,7 +25,7 @@ int main() {
   MDBX_val key, data;
   MDBX_txn *txn = NULL;
 
-  const char *db_filename = "./example-db";
+  const char *db_filename = "./test-dupfix-addodd";
   mdbx_env_delete(db_filename, MDBX_ENV_JUST_DELETE);
 
   rc = mdbx_env_create(&env);
diff --git a/test/extra/dupfix_multiple.c++ b/test/extra/dupfix_multiple.c++
index ecc02bc7..f4aa94be 100644
--- a/test/extra/dupfix_multiple.c++
+++ b/test/extra/dupfix_multiple.c++
@@ -9,7 +9,7 @@ using buffer = mdbx::default_buffer;
 
 bool case1_ordering(mdbx::env env) {
   auto txn = env.start_write();
-  auto map = txn.create_map(nullptr, mdbx::key_mode::ordinal, mdbx::value_mode::multi_ordinal);
+  auto map = txn.create_map("case1", mdbx::key_mode::ordinal, mdbx::value_mode::multi_ordinal);
 
   txn.insert(map, buffer::key_from_u64(21), buffer::key_from_u64(18));
   txn.insert(map, buffer::key_from_u64(7), buffer::key_from_u64(19));
@@ -175,7 +175,7 @@ bool case1_ordering(mdbx::env env) {
 bool case2_batch_read(mdbx::env env) {
 
   auto txn = env.start_write();
-  auto map = txn.create_map(nullptr, mdbx::key_mode::usual, mdbx::value_mode::multi_samelength);
+  auto map = txn.create_map("case2", mdbx::key_mode::usual, mdbx::value_mode::multi_samelength);
   txn.upsert(map, mdbx::slice("key1"), mdbx::slice("val1"));
   txn.upsert(map, mdbx::pair("key1", "val2"));
   txn.upsert(map, mdbx::pair("key1", "val3"));
@@ -270,7 +270,7 @@ bool case3_put_a_lot(mdbx::env env) {
 int doit() {
   mdbx::path db_filename = "test-dupfix-multiple";
   mdbx::env_managed::remove(db_filename);
-  mdbx::env_managed env(db_filename, mdbx::env_managed::create_parameters(), mdbx::env::operate_parameters(1));
+  mdbx::env_managed env(db_filename, mdbx::env_managed::create_parameters(), mdbx::env::operate_parameters(3));
 
   bool ok = case1_ordering(env);
   ok = case2_batch_read(env) && ok;
@@ -288,7 +288,6 @@ int doit() {
 int main(int argc, const char *argv[]) {
   (void)argc;
   (void)argv;
-
   try {
     return doit();
   } catch (const std::exception &ex) {
diff --git a/test/extra/early_close_dbi.c++ b/test/extra/early_close_dbi.c++
index 3eeea42c..cb5d1b6d 100644
--- a/test/extra/early_close_dbi.c++
+++ b/test/extra/early_close_dbi.c++
@@ -1,13 +1,11 @@
 #include "mdbx.h++"
 #include <cstring>
+#include <iostream>
 
 static const char *const testkey = "testkey";
 static uint64_t testval = 11;
 
-int main(int argc, char *argv[]) {
-  (void)argc;
-  (void)argv;
-
+int doit() {
   mdbx::path db_filename = "test-early_close_dbi";
   mdbx::env_managed::remove(db_filename);
 
@@ -126,3 +124,14 @@ int main(int argc, char *argv[]) {
 
   return 0;
 }
+
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
diff --git a/test/extra/hex_base64_base58.c++ b/test/extra/hex_base64_base58.c++
index 972673e9..6196d348 100644
--- a/test/extra/hex_base64_base58.c++
+++ b/test/extra/hex_base64_base58.c++
@@ -75,10 +75,7 @@ static bool basic() {
   return ok;
 }
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
+int doit() {
   auto ok = basic();
   for (size_t n = 0; n < 1000; ++n) {
     for (size_t length = 0; ok && length < 111; ++length) {
@@ -108,3 +105,14 @@ int main(int argc, const char *argv[]) {
   std::cout << "OK\n";
   return EXIT_SUCCESS;
 }
+
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
diff --git a/test/extra/maindb_ordinal.c++ b/test/extra/maindb_ordinal.c++
index 9e6bd7ef..359cff89 100644
--- a/test/extra/maindb_ordinal.c++
+++ b/test/extra/maindb_ordinal.c++
@@ -4,11 +4,8 @@
 #include "mdbx.h++"
 #include <iostream>
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
-  mdbx::path db_filename = "test-dupfix-multiple";
+static int doit() {
+  mdbx::path db_filename = "test-maindb-ordinal";
   mdbx::env_managed::remove(db_filename);
   mdbx::env_managed env(db_filename, mdbx::env_managed::create_parameters(), mdbx::env::operate_parameters());
 
@@ -51,3 +48,14 @@ int main(int argc, const char *argv[]) {
   return EXIT_SUCCESS;
 #endif /* __cpp_lib_string_view >= 201606L */
 }
+
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
diff --git a/test/extra/open.c++ b/test/extra/open.c++
index 459ca708..353b848e 100644
--- a/test/extra/open.c++
+++ b/test/extra/open.c++
@@ -25,12 +25,7 @@ static void logger_nofmt(MDBX_log_level_t loglevel, const char *function, int li
   fprintf(stdout, "%s:%u %s", function, line, msg);
 }
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
-  mdbx_setup_debug_nofmt(MDBX_LOG_VERBOSE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
-
+int doit() {
   mdbx::path path = "test-open";
   mdbx::env::remove(path);
 
@@ -86,4 +81,16 @@ int main(int argc, const char *argv[]) {
   return EXIT_SUCCESS;
 }
 
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  mdbx_setup_debug_nofmt(MDBX_LOG_VERBOSE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
+
 #endif /* __cpp_lib_latch */
diff --git a/test/extra/txn.c++ b/test/extra/txn.c++
index e1abb1e6..583328cf 100644
--- a/test/extra/txn.c++
+++ b/test/extra/txn.c++
@@ -308,12 +308,7 @@ bool case2(const mdbx::path &path, bool no_sticky_threads) {
   return true;
 }
 
-int main(int argc, const char *argv[]) {
-  (void)argc;
-  (void)argv;
-
-  mdbx_setup_debug_nofmt(MDBX_LOG_VERBOSE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
-
+int doit() {
   mdbx::path path = "test-txn";
   mdbx::env::remove(path);
 
@@ -326,4 +321,16 @@ int main(int argc, const char *argv[]) {
   return ok ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
+int main(int argc, char *argv[]) {
+  (void)argc;
+  (void)argv;
+  mdbx_setup_debug_nofmt(MDBX_LOG_VERBOSE, MDBX_DBG_ASSERT, logger_nofmt, log_buffer, sizeof(log_buffer));
+  try {
+    return doit();
+  } catch (const std::exception &ex) {
+    std::cerr << "Exception: " << ex.what() << "\n";
+    return EXIT_FAILURE;
+  }
+}
+
 #endif /* __cpp_lib_latch */