diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 58a60fd917..8d0ec051e1 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -56,11 +56,13 @@
           'target_name': 'modules_unittests',
           'type': 'executable',
           'dependencies': [
+            'webrtc_utility',
             '<(DEPTH)/testing/gtest.gyp:gtest',
             '<(webrtc_root)/test/test.gyp:test_support_main',
           ],
           'sources': [
             'module_common_types_unittest.cc',
+            'utility/source/audio_frame_operations_unittest.cc',
           ],
         },
       ],
diff --git a/webrtc/modules/utility/source/utility.gypi b/webrtc/modules/utility/source/utility.gypi
index 2f161c5e70..22d79e4b80 100644
--- a/webrtc/modules/utility/source/utility.gypi
+++ b/webrtc/modules/utility/source/utility.gypi
@@ -67,22 +67,4 @@
       ],
     },
   ], # targets
-  'conditions': [
-    ['include_tests==1', {
-      'targets': [
-        {
-          'target_name': 'webrtc_utility_unittests',
-          'type': 'executable',
-          'dependencies': [
-            'webrtc_utility',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(webrtc_root)/test/test.gyp:test_support_main',
-          ],
-          'sources': [
-            'audio_frame_operations_unittest.cc',
-          ],
-        }, # webrtc_utility_unittests
-      ], # targets
-    }], # include_tests
-  ], # conditions
 }