diff --git a/test/cfoa/constructor_tests.cpp b/test/cfoa/constructor_tests.cpp
index d3caf019..f5572c08 100644
--- a/test/cfoa/constructor_tests.cpp
+++ b/test/cfoa/constructor_tests.cpp
@@ -222,7 +222,7 @@ namespace {
 
       thread_runner(
         values, [&x, &reference_map](
-                  boost::span<typename decltype(values)::value_type> s) {
+                  boost::span<span_value_type<decltype(values)> > s) {
           (void)s;
           map_type y(x);
 
@@ -259,7 +259,7 @@ namespace {
 
       thread_runner(
         values, [&x, &reference_map, &values, rg](
-                  boost::span<typename decltype(values)::value_type> s) {
+                  boost::span<span_value_type<decltype(values)> > s) {
           (void)s;
           map_type y(x);
 
@@ -314,7 +314,7 @@ namespace {
 
       thread_runner(
         values, [&x, &reference_map, &num_transfers](
-                  boost::span<typename decltype(values)::value_type> s) {
+                  boost::span<span_value_type<decltype(values)> > s) {
           (void)s;
 
           auto const old_size = x.size();
@@ -356,20 +356,20 @@ namespace {
       map_type x(0, hasher(1), key_equal(2), allocator_type{});
 
       auto f = [&x, &values] {
-        std::this_thread::sleep_for(std::chrono::milliseconds(95));
+        std::this_thread::sleep_for(std::chrono::milliseconds(50));
         for (auto const& val : values) {
           x.insert(val);
         }
       };
 
-      std::atomic_int num_transfers{0};
+      std::atomic_uint num_transfers{0};
 
       std::thread t1(f);
       std::thread t2(f);
 
       thread_runner(
         values, [&x, &reference_map, &num_transfers, rg](
-                  boost::span<typename decltype(values)::value_type> s) {
+                  boost::span<span_value_type<decltype(values)> > s) {
           (void)s;
 
           map_type y(std::move(x));
diff --git a/test/cfoa/helpers.hpp b/test/cfoa/helpers.hpp
index 01f15ccf..0e2a3832 100644
--- a/test/cfoa/helpers.hpp
+++ b/test/cfoa/helpers.hpp
@@ -297,4 +297,7 @@ void test_matches_reference(X const& x, Y const& reference_map)
   }));
 }
 
+template <class T>
+using span_value_type = typename T::value_type;
+
 #endif // BOOST_UNORDERED_TEST_CFOA_HELPERS_HPP
\ No newline at end of file