diff --git a/test/flat_map_test.cpp b/test/flat_map_test.cpp
index ef1e3a4..d01598b 100644
--- a/test/flat_map_test.cpp
+++ b/test/flat_map_test.cpp
@@ -581,13 +581,13 @@ struct with_lookup_by_first
 
 bool test_heterogeneous_lookup_by_partial_key()
 {
-   flat_map<std::pair<int, int>,int, with_lookup_by_first> const map1
-   {
-      {{0, 1}, 3},
-      {{0, 2}, 3},
-   };
+   typedef flat_map<std::pair<int, int>,int, with_lookup_by_first> map_t;
 
-   auto const first_0_range = map1.equal_range(0);
+   map_t map1;
+   map1[std::pair<int, int>(0, 1)] = 3;
+   map1[std::pair<int, int>(0, 2)] = 3;
+
+   std::pair<map_t::iterator, map_t::iterator> const first_0_range = map1.equal_range(0);
 
    return 2 == first_0_range.second - first_0_range.first;
 }
diff --git a/test/flat_set_test.cpp b/test/flat_set_test.cpp
index c74cb78..693305f 100644
--- a/test/flat_set_test.cpp
+++ b/test/flat_set_test.cpp
@@ -597,13 +597,13 @@ struct with_lookup_by_first
 
 bool test_heterogeneous_lookup_by_partial_key()
 {
-   flat_set<std::pair<int, int>, with_lookup_by_first> const set1
-   {
-      {0, 1},
-      {0, 2},
-   };
+   typedef flat_set<std::pair<int, int>, with_lookup_by_first> set_t;
 
-   auto const first_0_range = set1.equal_range(0);
+   set_t set1;
+   set1.insert(std::pair<int, int>(0, 1));
+   set1.insert(std::pair<int, int>(0, 2));
+
+   std::pair<set_t::iterator, set_t::iterator> const first_0_range = set1.equal_range(0);
 
    return 2 == first_0_range.second - first_0_range.first;
 }