diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc
index d282bf23a1..bbea5f841a 100644
--- a/test/testsupport/perf_test.cc
+++ b/test/testsupport/perf_test.cc
@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 
+#include <algorithm>
 #include <fstream>
 #include <set>
 #include <sstream>
@@ -48,11 +49,11 @@ std::vector<SamplesStatsCounter::StatsSample> GetSortedSamples(
   rtc::ArrayView<const SamplesStatsCounter::StatsSample> view =
       counter.GetTimedSamples();
   std::vector<SamplesStatsCounter::StatsSample> out(view.begin(), view.end());
-  std::sort(out.begin(), out.end(),
-            [](const SamplesStatsCounter::StatsSample& a,
-               const SamplesStatsCounter::StatsSample& b) {
-              return a.time < b.time;
-            });
+  std::stable_sort(out.begin(), out.end(),
+                   [](const SamplesStatsCounter::StatsSample& a,
+                      const SamplesStatsCounter::StatsSample& b) {
+                     return a.time < b.time;
+                   });
   return out;
 }
 
diff --git a/test/testsupport/perf_test_unittest.cc b/test/testsupport/perf_test_unittest.cc
index 4cd925d8fb..509882db08 100644
--- a/test/testsupport/perf_test_unittest.cc
+++ b/test/testsupport/perf_test_unittest.cc
@@ -14,6 +14,7 @@
 #include <limits>
 #include <string>
 
+#include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/testsupport/rtc_expect_death.h"
 
@@ -162,11 +163,7 @@ TEST_F(PerfTest, TestGetPerfResultsHistogramsWithStatsCounter) {
   // histogram writer itself).
   EXPECT_EQ(hist.unit().unit(), proto::MS_BEST_FIT_FORMAT);
   EXPECT_EQ(hist.sample_values_size(), 5);
-  EXPECT_EQ(hist.sample_values(0), 1);
-  EXPECT_EQ(hist.sample_values(1), 2);
-  EXPECT_EQ(hist.sample_values(2), 3);
-  EXPECT_EQ(hist.sample_values(3), 4);
-  EXPECT_EQ(hist.sample_values(4), 5);
+  EXPECT_THAT(hist.sample_values(), testing::ElementsAre(1, 2, 3, 4, 5));
 
   EXPECT_EQ(hist.diagnostics().diagnostic_map().count("stories"), 1u);
   const proto::Diagnostic& stories =