diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index e575fae7e..6aa100ef3 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -50,7 +50,7 @@
         'video_coding/codecs/test_framework/test_framework.gypi',
         'video_coding/codecs/tools/video_codecs_tools.gypi',
       ], # includes
-     'variables': {
+      'variables': {
         'conditions': [
           # Desktop capturer is supported only on Windows, OSX and Linux.
           ['OS=="win" or OS=="mac" or OS=="linux"', {
@@ -87,7 +87,7 @@
             'webrtc_utility',
             'webrtc_video_coding',
             '<@(neteq_dependencies)',
-            '<(rbe_components_path)/remote_bitrate_estimator_components.gyp:rbe_components_unittests',
+            '<(rbe_components_path)/remote_bitrate_estimator_components.gyp:rbe_components',
             '<(DEPTH)/testing/gmock.gyp:gmock',
             '<(DEPTH)/testing/gtest.gyp:gtest',
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
@@ -164,6 +164,9 @@
             'pacing/paced_sender_unittest.cc',
             'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h',
             'remote_bitrate_estimator/bitrate_estimator_unittest.cc',
+            'remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc',
+            'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc',
+            'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h',
             'remote_bitrate_estimator/rtp_to_ntp_unittest.cc',
             'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h',
             'rtp_rtcp/source/fec_receiver_unittest.cc',
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
index 25973ccec..c5eca0535 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
@@ -26,24 +26,4 @@
       ],
     },
   ],
-  'conditions': [
-    ['include_tests==1', {
-      'targets': [
-        {
-          'target_name': 'rbe_components_unittests',
-          'type': 'static_library',
-          'dependencies': [
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-          ],
-          'sources': [
-            '<(rbe_components_path)/remote_bitrate_estimator_single_stream_unittest.cc',
-            '<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.cc',
-            '<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.h',
-          ],
-        },
-      ],
-    },
-    ],
-  ],
 }