diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
index 2ce144129b..31cd9f9802 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
@@ -29,215 +29,6 @@ namespace webrtc {
 namespace testing {
 namespace bwe {
 
-class DefaultBweTest : public BweTest,
-                       public ::testing::TestWithParam<BandwidthEstimatorType> {
- public:
-  virtual ~DefaultBweTest() {}
-};
-
-INSTANTIATE_TEST_CASE_P(VideoSendersTest,
-                        DefaultBweTest,
-                        ::testing::Values(kRembEstimator,
-                                          kFullSendSideEstimator));
-
-TEST_P(DefaultBweTest, UnlimitedSpeed) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, SteadyLoss) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  LossFilter loss(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  loss.SetLoss(20.0);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, IncreasingLoss1) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  LossFilter loss(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  for (int i = 0; i < 76; ++i) {
-    loss.SetLoss(i);
-    RunFor(5000);
-  }
-}
-
-TEST_P(DefaultBweTest, SteadyDelay) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  DelayFilter delay(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  delay.SetOneWayDelayMs(1000);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, IncreasingDelay1) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  DelayFilter delay(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  RunFor(10 * 60 * 1000);
-  for (int i = 0; i < 30 * 2; ++i) {
-    delay.SetOneWayDelayMs(i);
-    RunFor(10 * 1000);
-  }
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, IncreasingDelay2) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  DelayFilter delay(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "", "");
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  RunFor(1 * 60 * 1000);
-  for (int i = 1; i < 51; ++i) {
-    delay.SetOneWayDelayMs(10.0f * i);
-    RunFor(10 * 1000);
-  }
-  delay.SetOneWayDelayMs(0.0f);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, JumpyDelay1) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  DelayFilter delay(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  RunFor(10 * 60 * 1000);
-  for (int i = 1; i < 200; ++i) {
-    delay.SetOneWayDelayMs((10 * i) % 500);
-    RunFor(1000);
-    delay.SetOneWayDelayMs(1.0f);
-    RunFor(1000);
-  }
-  delay.SetOneWayDelayMs(0.0f);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, SteadyJitter) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  JitterFilter jitter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "", "");
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  jitter.SetMaxJitter(20);
-  RunFor(2 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, IncreasingJitter1) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  JitterFilter jitter(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  for (int i = 0; i < 2 * 60 * 2; ++i) {
-    jitter.SetMaxJitter(i);
-    RunFor(10 * 1000);
-  }
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, IncreasingJitter2) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  JitterFilter jitter(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  RunFor(30 * 1000);
-  for (int i = 1; i < 51; ++i) {
-    jitter.SetMaxJitter(10.0f * i);
-    RunFor(10 * 1000);
-  }
-  jitter.SetMaxJitter(0.0f);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, SteadyReorder) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  ReorderFilter reorder(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  reorder.SetReorder(20.0);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, IncreasingReorder1) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  ReorderFilter reorder(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  for (int i = 0; i < 76; ++i) {
-    reorder.SetReorder(i);
-    RunFor(5000);
-  }
-}
-
-TEST_P(DefaultBweTest, SteadyChoke) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  ChokeFilter choke(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  choke.set_capacity_kbps(140);
-  RunFor(10 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, IncreasingChoke1) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  ChokeFilter choke(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  for (int i = 1200; i >= 100; i -= 100) {
-    choke.set_capacity_kbps(i);
-    RunFor(5000);
-  }
-}
-
-TEST_P(DefaultBweTest, IncreasingChoke2) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  ChokeFilter choke(&uplink_, 0);
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  RunFor(60 * 1000);
-  for (int i = 1200; i >= 100; i -= 20) {
-    choke.set_capacity_kbps(i);
-    RunFor(1000);
-  }
-}
-
-TEST_P(DefaultBweTest, Multi1) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  DelayFilter delay(&uplink_, 0);
-  ChokeFilter choke(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "", "");
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  choke.set_capacity_kbps(1000);
-  RunFor(1 * 60 * 1000);
-  for (int i = 1; i < 51; ++i) {
-    delay.SetOneWayDelayMs(100.0f * i);
-    RunFor(10 * 1000);
-  }
-  RunFor(500 * 1000);
-  delay.SetOneWayDelayMs(0.0f);
-  RunFor(5 * 60 * 1000);
-}
-
-TEST_P(DefaultBweTest, Multi2) {
-  VideoSource source(0, 30, 300, 0, 0);
-  VideoSender sender(&uplink_, &source, GetParam());
-  ChokeFilter choke(&uplink_, 0);
-  JitterFilter jitter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "", "");
-  PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
-  choke.set_capacity_kbps(2000);
-  jitter.SetMaxJitter(120);
-  RunFor(5 * 60 * 1000);
-}
-
 // This test fixture is used to instantiate tests running with adaptive video
 // senders.
 class BweFeedbackTest