diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc
index a3f7701d5..1563ed183 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc
@@ -239,7 +239,7 @@ void BweTest::RunFairnessTest(BandwidthEstimatorType bwe_type,
 
   ChokeFilter choke(&uplink_, all_flow_ids);
   choke.SetCapacity(capacity_kbps);
-  // choke.SetMaxDelay(1000);
+  choke.SetMaxDelay(1000);
 
   std::vector<RateCounterFilter*> rate_counters;
   for (int flow : all_flow_ids) {
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc
index 372f35120..bbab4e535 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc
@@ -313,7 +313,8 @@ void TcpSender::UpdateCongestionControl(const FeedbackPacket* fb) {
 
 bool TcpSender::LossEvent(const std::vector<uint16_t>& acked_packets) {
   uint16_t expected = acked_packets.back() - last_acked_seq_num_;
-  return expected - static_cast<uint16_t>(acked_packets.size()) > 0;
+  uint16_t missing = expected - static_cast<uint16_t>(acked_packets.size());
+  return missing > 0;
 }
 
 Packets TcpSender::GeneratePackets(size_t num_packets) {