diff --git a/common/map_test.cpp b/common/map_test.cpp
index d74645f0f320..4aa5128c1392 100644
--- a/common/map_test.cpp
+++ b/common/map_test.cpp
@@ -77,7 +77,7 @@ auto MakeKeyValues(ValueCB value_cb, RangeT&& range, RangeTs&&... ranges)
     }
   };
   add_range(std::forward<RangeT>(range));
-  (add_range(std::forward<RangeT>(ranges)), ...);
+  (add_range(std::forward<RangeTs>(ranges)), ...);
 
   return elements;
 }
diff --git a/common/set_test.cpp b/common/set_test.cpp
index 77e76461fc4c..f6e2a93820f1 100644
--- a/common/set_test.cpp
+++ b/common/set_test.cpp
@@ -51,7 +51,7 @@ auto MakeElements(RangeT&& range, RangeTs&&... ranges) {
     }
   };
   add_range(std::forward<RangeT>(range));
-  (add_range(std::forward<RangeT>(ranges)), ...);
+  (add_range(std::forward<RangeTs>(ranges)), ...);
 
   return elements;
 }