diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
index 552422ce3a..8242571c71 100644
--- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
+++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
@@ -123,6 +123,8 @@ void RunBitExactnessTest(int sample_rate_hz,
       output_reference, capture_output, kTolerance));
 }
 
+// TODO(peah): Add bitexactness tests for scenarios with more than 2 input
+// channels.
 std::vector<Point> CreateArrayGeometry(int variant) {
   std::vector<Point> array_geometry;
   switch (variant) {
@@ -247,6 +249,9 @@ TEST(NonlinearBeamformerTest, InterfAnglesTakeAmbiguityIntoAccount) {
   }
 }
 
+// TODO(peah): Reenable all bitexactness tests once the division-by-zero issue
+// has been resolved.
+
 // TODO(peah): Investigate why the nonlinear_beamformer.cc causes a DCHECK in
 // this setup.
 TEST(BeamformerBitExactnessTest,