diff --git a/test/cfoa/emplace_tests.cpp b/test/cfoa/emplace_tests.cpp
index ab6215cf..ba8ac70d 100644
--- a/test/cfoa/emplace_tests.cpp
+++ b/test/cfoa/emplace_tests.cpp
@@ -55,11 +55,11 @@ namespace {
       thread_runner(values, [&x, &num_inserts, &num_invokes](boost::span<T> s) {
         for (auto& r : s) {
           bool b = x.emplace_or_cvisit(
+            r.first.x_, r.second.x_,
             [&num_invokes](typename X::value_type const& v) {
               (void)v;
               ++num_invokes;
-            },
-            r.first.x_, r.second.x_);
+            });
 
           if (b) {
             ++num_inserts;
diff --git a/test/cfoa/try_emplace_tests.cpp b/test/cfoa/try_emplace_tests.cpp
index bb58e5b8..374c5f02 100644
--- a/test/cfoa/try_emplace_tests.cpp
+++ b/test/cfoa/try_emplace_tests.cpp
@@ -144,12 +144,11 @@ namespace {
       thread_runner(values, [&x, &num_inserts, &num_invokes](boost::span<T> s) {
         for (auto& r : s) {
           bool b = x.try_emplace_or_cvisit(
-            r.first,
+            r.first, r.second.x_,
             [&num_invokes](typename X::value_type const& v) {
               (void)v;
               ++num_invokes;
-            },
-            r.second.x_);
+            });
 
           if (b) {
             ++num_inserts;
@@ -211,12 +210,11 @@ namespace {
       thread_runner(values, [&x, &num_inserts, &num_invokes](boost::span<T> s) {
         for (auto& r : s) {
           bool b = x.try_emplace_or_cvisit(
-            std::move(r.first),
+            std::move(r.first), r.second.x_,
             [&num_invokes](typename X::value_type const& v) {
               (void)v;
               ++num_invokes;
-            },
-            r.second.x_);
+            });
 
           if (b) {
             ++num_inserts;
@@ -283,12 +281,11 @@ namespace {
       thread_runner(values, [&x, &num_inserts, &num_invokes](boost::span<T> s) {
         for (auto& r : s) {
           bool b = x.try_emplace_or_cvisit(
-            r.first.x_,
+            r.first.x_, r.second.x_,
             [&num_invokes](typename X::value_type const& v) {
               (void)v;
               ++num_invokes;
-            },
-            r.second.x_);
+            });
 
           if (b) {
             ++num_inserts;