diff --git a/webrtc/modules/audio_processing/audio_processing_tests.gypi b/webrtc/modules/audio_processing/audio_processing_tests.gypi
index 05d7514bde..82aa7fd14f 100644
--- a/webrtc/modules/audio_processing/audio_processing_tests.gypi
+++ b/webrtc/modules/audio_processing/audio_processing_tests.gypi
@@ -7,24 +7,22 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'targets': [
-    {
-      'target_name': 'audioproc_unittest_proto',
-      'type': 'static_library',
-      'sources': [ 'test/unittest.proto', ],
-      'variables': {
-        'proto_in_dir': 'test',
-        # Workaround to protect against gyp's pathname relativization when this
-        # file is included by modules.gyp.
-        'proto_out_protected': 'webrtc/audio_processing',
-        'proto_out_dir': '<(proto_out_protected)',
-      },
-      'includes': [ '../../build/protoc.gypi', ],
-    },
-  ],
   'conditions': [
     ['enable_protobuf==1', {
       'targets': [
+        {
+          'target_name': 'audioproc_unittest_proto',
+          'type': 'static_library',
+          'sources': [ 'test/unittest.proto', ],
+          'variables': {
+            'proto_in_dir': 'test',
+            # Workaround to protect against gyp's pathname relativization when
+            # this file is included by modules.gyp.
+            'proto_out_protected': 'webrtc/audio_processing',
+            'proto_out_dir': '<(proto_out_protected)',
+          },
+          'includes': [ '../../build/protoc.gypi', ],
+        },
         {
           'target_name': 'audioproc',
           'type': 'executable',
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 5d0827cf78..096c04e1ed 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -71,7 +71,6 @@
           'dependencies': [
             'audio_coding_module',
             'audio_processing',
-            'audioproc_unittest_proto',
             'bitrate_controller',
             'CNG',
             'desktop_capture',
@@ -155,10 +154,7 @@
             'audio_coding/neteq4/mock/mock_payload_splitter.h',
             'audio_processing/aec/system_delay_unittest.cc',
             'audio_processing/aec/echo_cancellation_unittest.cc',
-            'audio_processing/audio_processing_impl_unittest.cc',
             'audio_processing/echo_cancellation_impl_unittest.cc',
-            'audio_processing/test/audio_processing_unittest.cc',
-            'audio_processing/test/test_utils.h',
             'audio_processing/utility/delay_estimator_unittest.cc',
             'audio_processing/utility/ring_buffer_unittest.cc',
             'bitrate_controller/bitrate_controller_unittest.cc',
@@ -285,6 +281,14 @@
             }],
             ['enable_protobuf==1', {
               'defines': [ 'WEBRTC_AUDIOPROC_DEBUG_DUMP' ],
+              'dependencies': [
+                'audioproc_unittest_proto',
+              ],
+              'sources': [
+                'audio_processing/audio_processing_impl_unittest.cc',
+                'audio_processing/test/audio_processing_unittest.cc',
+                'audio_processing/test/test_utils.h',
+              ],
             }],
             ['build_libvpx==1', {
               'dependencies': [