diff --git a/src/test/common/test_fault_injector.cc b/src/test/common/test_fault_injector.cc
index dfa147478ea58..9b5eb1595bc67 100644
--- a/src/test/common/test_fault_injector.cc
+++ b/src/test/common/test_fault_injector.cc
@@ -40,8 +40,9 @@ class Fixture : public testing::Test {
  protected:
   void SetUp() override {
     CephInitParameters params(CEPH_ENTITY_TYPE_CLIENT);
-    cct = common_preinit(params, CODE_ENVIRONMENT_UTILITY,
-                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
+    cct.reset(common_preinit(params, CODE_ENVIRONMENT_UTILITY,
+			     CINIT_FLAG_NO_DEFAULT_CONFIG_FILE),
+	      false);
     prefix.emplace(cct.get(), ceph_subsys_context);
   }
   void TearDown() override {
diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc
index bc8dbef70d7e1..8b362df9880d8 100644
--- a/src/test/test_ipaddr.cc
+++ b/src/test/test_ipaddr.cc
@@ -703,7 +703,7 @@ TEST(pick_address, find_ip_in_subnet_list)
   ipv4(&a_two, "10.2.1.123");
   ipv6(&a_three, "2001:1234:5678:90ab::cdef");
 
-  boost::intrusive_ptr<CephContext> cct = new CephContext(CEPH_ENTITY_TYPE_OSD);
+  boost::intrusive_ptr<CephContext> cct{new CephContext(CEPH_ENTITY_TYPE_OSD), false};
 
   // match by network
   result = find_ip_in_subnet_list(