diff --git a/tests/condition/scalar_condition_test.cpp b/tests/condition/scalar_condition_test.cpp
index d331a5e6..70537fc5 100644
--- a/tests/condition/scalar_condition_test.cpp
+++ b/tests/condition/scalar_condition_test.cpp
@@ -82,13 +82,12 @@ TEST(TestScalarCondition, CachedMatch)
 
     ddwaf_object tmp;
     ddwaf_object root;
+    ddwaf_object_map(&root);
+    ddwaf_object_map_add(&root, "server.request.uri_raw", ddwaf_object_string(&tmp, "hello"));
 
     {
-        ddwaf_object_map(&root);
-        ddwaf_object_map_add(&root, "server.request.uri_raw", ddwaf_object_string(&tmp, "hello"));
-
         object_store store;
-        store.insert(root);
+        store.insert(root, object_store::attribute::none, nullptr);
 
         auto res = cond.eval(cache, store, {}, {}, deadline);
         ASSERT_TRUE(res.outcome);
@@ -96,16 +95,15 @@ TEST(TestScalarCondition, CachedMatch)
     }
 
     {
-        ddwaf_object_map(&root);
-        ddwaf_object_map_add(&root, "server.request.uri_raw", ddwaf_object_string(&tmp, "hello"));
-
         object_store store;
-        store.insert(root);
+        store.insert(root, object_store::attribute::none, nullptr);
 
         auto res = cond.eval(cache, store, {}, {}, deadline);
         ASSERT_FALSE(res.outcome);
         ASSERT_FALSE(res.ephemeral);
     }
+
+    ddwaf_object_free(&root);
 }
 
 } // namespace
diff --git a/tests/condition/scalar_negated_condition_test.cpp b/tests/condition/scalar_negated_condition_test.cpp
index 7bc5c10c..bacf784e 100644
--- a/tests/condition/scalar_negated_condition_test.cpp
+++ b/tests/condition/scalar_negated_condition_test.cpp
@@ -94,13 +94,12 @@ TEST(TestScalarNegatedCondition, CachedMatch)
 
     ddwaf_object tmp;
     ddwaf_object root;
+    ddwaf_object_map(&root);
+    ddwaf_object_map_add(&root, "server.request.uri_raw", ddwaf_object_invalid(&tmp));
 
     {
-        ddwaf_object_map(&root);
-        ddwaf_object_map_add(&root, "server.request.uri_raw", ddwaf_object_invalid(&tmp));
-
         object_store store;
-        store.insert(root);
+        store.insert(root, object_store::attribute::none, nullptr);
 
         auto res = cond.eval(cache, store, {}, {}, deadline);
         ASSERT_TRUE(res.outcome);
@@ -108,16 +107,15 @@ TEST(TestScalarNegatedCondition, CachedMatch)
     }
 
     {
-        ddwaf_object_map(&root);
-        ddwaf_object_map_add(&root, "server.request.uri_raw", ddwaf_object_invalid(&tmp));
-
         object_store store;
-        store.insert(root);
+        store.insert(root, object_store::attribute::none, nullptr);
 
         auto res = cond.eval(cache, store, {}, {}, deadline);
         ASSERT_FALSE(res.outcome);
         ASSERT_FALSE(res.ephemeral);
     }
+
+    ddwaf_object_free(&root);
 }
 
 } // namespace