diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2212,11 +2212,9 @@
     node.scheduler = std::make_unique<CScheduler>();
 
     // Start the lightweight task scheduler thread
-    CScheduler::Function serviceLoop = [&node] {
-        node.scheduler->serviceQueue();
-    };
-    threadGroup.create_thread(std::bind(&TraceThread<CScheduler::Function>,
-                                        "scheduler", serviceLoop));
+    threadGroup.create_thread([&] {
+        TraceThread("scheduler", [&] { node.scheduler->serviceQueue(); });
+    });
 
     // Gather some entropy once per minute.
     node.scheduler->scheduleEvery(
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -96,6 +96,7 @@
             "dummy",
             "-printtoconsole=0",
             "-logtimemicros",
+            "-logthreadnames",
             "-debug",
             "-debugexclude=libevent",
             "-debugexclude=leveldb",
@@ -104,6 +105,7 @@
         extra_args);
     // clang-format on
     arguments = Cat(arguments, fixture_extra_args);
+    util::ThreadRename("test");
     auto &config = const_cast<Config &>(GetConfig());
     SetMockTime(0);
     fs::create_directories(m_path_root);
@@ -172,7 +174,9 @@
 
     // We have to run a scheduler thread to prevent ActivateBestChain
     // from blocking due to queue overrun.
-    threadGroup.create_thread([&] { m_node.scheduler->serviceQueue(); });
+    threadGroup.create_thread([&] {
+        TraceThread("scheduler", [&] { m_node.scheduler->serviceQueue(); });
+    });
     GetMainSignals().RegisterBackgroundSignalScheduler(*m_node.scheduler);
 
     pblocktree.reset(new CBlockTreeDB(1 << 20, true));
diff --git a/src/test/util_threadnames_tests.cpp b/src/test/util_threadnames_tests.cpp
--- a/src/test/util_threadnames_tests.cpp
+++ b/src/test/util_threadnames_tests.cpp
@@ -54,8 +54,6 @@
  * ensuring suffixes are applied properly.
  */
 BOOST_AUTO_TEST_CASE(util_threadnames_test_rename_threaded) {
-    BOOST_CHECK_EQUAL(util::ThreadGetInternalName(), "");
-
     std::set<std::string> names = RenameEnMasse(100);
 
     BOOST_CHECK_EQUAL(names.size(), 100U);