diff --git a/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/modules/remote_bitrate_estimator/send_time_history_unittest.cc
index 6f05bcf846..5e2ece6d60 100644
--- a/modules/remote_bitrate_estimator/send_time_history_unittest.cc
+++ b/modules/remote_bitrate_estimator/send_time_history_unittest.cc
@@ -10,6 +10,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <random>
 #include <vector>
 
 #include "modules/remote_bitrate_estimator/include/send_time_history.h"
@@ -123,7 +124,8 @@ TEST_F(SendTimeHistoryTest, AddThenRemoveOutOfOrder) {
   for (size_t i = 0; i < num_items; ++i)
     history_.OnSentPacket(sent_packets[i].sequence_number,
                           sent_packets[i].send_time_ms);
-  std::random_shuffle(received_packets.begin(), received_packets.end());
+  std::shuffle(received_packets.begin(), received_packets.end(),
+               std::mt19937(std::random_device()()));
   for (size_t i = 0; i < num_items; ++i) {
     PacketFeedback packet = received_packets[i];
     EXPECT_TRUE(history_.GetFeedback(&packet, false));
diff --git a/modules/remote_bitrate_estimator/test/bwe_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_unittest.cc
index 6c0bc53f20..892020c3c4 100644
--- a/modules/remote_bitrate_estimator/test/bwe_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_unittest.cc
@@ -10,6 +10,7 @@
 
 #include "modules/remote_bitrate_estimator/test/bwe.h"
 
+#include <random>
 #include <vector>
 
 #include "rtc_base/arraysize.h"
@@ -52,7 +53,8 @@ TEST_F(LinkedSetTest, MultiplePackets) {
   for (size_t i = 0; i < kNumberPackets; ++i) {
     sequence_numbers.push_back(static_cast<uint16_t>(i + 1));
   }
-  random_shuffle(sequence_numbers.begin(), sequence_numbers.end());
+  std::shuffle(sequence_numbers.begin(), sequence_numbers.end(),
+               std::mt19937(std::random_device()()));
 
   for (size_t i = 0; i < kNumberPackets; ++i) {
     // Other parameters don't matter here.
@@ -319,7 +321,8 @@ TEST_F(BweReceiverTest, PacketLossUnorderedPackets) {
     sequence_numbers.push_back(static_cast<uint16_t>(i + 1));
   }
 
-  random_shuffle(sequence_numbers.begin(), sequence_numbers.end());
+  std::shuffle(sequence_numbers.begin(), sequence_numbers.end(),
+               std::mt19937(std::random_device()()));
 
   for (size_t i = 0; i < num_packets; ++i) {
     const MediaPacket media_packet(kFlowId, 0, 0, sequence_numbers[i]);
diff --git a/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc b/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
index f085797643..bc0d6d40d5 100644
--- a/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
@@ -12,6 +12,7 @@
 
 #include <math.h>
 #include <algorithm>
+#include <random>
 #include <vector>
 
 #include "test/gtest.h"
@@ -74,7 +75,8 @@ TEST_F(MetricRecorderTest, VariableDelayPackets) {
     delays_ms.push_back(static_cast<int64_t>(i + 1));
   }
   // Order of packets should not matter here.
-  std::random_shuffle(delays_ms.begin(), delays_ms.end());
+  std::shuffle(delays_ms.begin(), delays_ms.end(),
+               std::mt19937(std::random_device()()));
 
   int first_received_ms = delays_ms[0];
   int64_t last_received_ms = 0;
diff --git a/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc
index b7aff43010..11fb4a5372 100644
--- a/rtc_base/numerics/percentile_filter_unittest.cc
+++ b/rtc_base/numerics/percentile_filter_unittest.cc
@@ -10,6 +10,7 @@
 
 #include <algorithm>
 #include <climits>
+#include <random>
 
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/numerics/percentile_filter.h"
@@ -113,7 +114,8 @@ TEST_P(PercentileFilterTest, InsertAndEraseTenValuesInRandomOrder) {
 
   // Insert two sets of |zero_to_nine| in random order.
   for (int i = 0; i < 2; ++i) {
-    std::random_shuffle(zero_to_nine, zero_to_nine + 10);
+    std::shuffle(zero_to_nine, zero_to_nine + 10,
+                 std::mt19937(std::random_device()()));
     for (int64_t value : zero_to_nine)
       filter_.Insert(value);
     // After inserting a full set of |zero_to_nine|, the percentile should
@@ -123,12 +125,13 @@ TEST_P(PercentileFilterTest, InsertAndEraseTenValuesInRandomOrder) {
 
   // Insert and erase sets of |zero_to_nine| in random order a few times.
   for (int i = 0; i < 3; ++i) {
-    std::random_shuffle(zero_to_nine, zero_to_nine + 10);
+    std::shuffle(zero_to_nine, zero_to_nine + 10,
+                 std::mt19937(std::random_device()()));
     for (int64_t value : zero_to_nine)
       filter_.Erase(value);
     EXPECT_EQ(expected_value, filter_.GetPercentileValue());
-
-    std::random_shuffle(zero_to_nine, zero_to_nine + 10);
+    std::shuffle(zero_to_nine, zero_to_nine + 10,
+                 std::mt19937(std::random_device()()));
     for (int64_t value : zero_to_nine)
       filter_.Insert(value);
     EXPECT_EQ(expected_value, filter_.GetPercentileValue());