diff --git a/src/modules/audio_coding/NetEQ/main/source/neteq_tests.gyp b/src/modules/audio_coding/NetEQ/main/neteq_tests.gypi
similarity index 75%
rename from src/modules/audio_coding/NetEQ/main/source/neteq_tests.gyp
rename to src/modules/audio_coding/NetEQ/main/neteq_tests.gypi
index 87b238caa3..0199977f8d 100644
--- a/src/modules/audio_coding/NetEQ/main/source/neteq_tests.gyp
+++ b/src/modules/audio_coding/NetEQ/main/neteq_tests.gypi
@@ -7,20 +7,17 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'includes': [
-    '../../../../../common_settings.gypi',
-  ],
   'targets': [
     {
       'target_name': 'neteq_unittest',
       'type': 'executable',
       'dependencies': [
-        'neteq.gyp:NetEq',
-        'neteq.gyp:NetEqTestTools',
-        '../../../../../../testing/gtest.gyp:gtest',
+        'NetEq',
+        'NetEqTestTools',
+        '<(webrtc_root)/../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        'neteq_api_unittest.cc',
+        'source/neteq_api_unittest.cc',
       ],
     },
   ],
diff --git a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.cc b/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.cc
index d9cb7a12c3..66e912bed3 100644
--- a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.cc
+++ b/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.cc
@@ -306,7 +306,9 @@ WebRtc_Word16 NETEQTEST_NetEQClass::recOut(WebRtc_Word16 *outData, void *msInfo,
 
         if (newfsmult != _fsmult)
         {
+#ifdef NETEQTEST_PRINT_WARNINGS
             printf("Warning: output sample rate changed\n");
+#endif  // NETEQTEST_PRINT_WARNINGS
             _fsmult = newfsmult;
         }
     }
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
index ca1678b3ab..690e95fa58 100644
--- a/src/modules/modules.gyp
+++ b/src/modules/modules.gyp
@@ -46,6 +46,7 @@
         'audio_coding/codecs/iLBC/ilbc_test.gypi',
         'audio_coding/codecs/iSAC/isac_test.gypi',
         'audio_coding/codecs/iSAC/isacfix_test.gypi',
+        'audio_coding/NetEQ/main/neteq_tests.gypi',
         'audio_processing/main/apm_tests.gypi',
         'rtp_rtcp/source/rtp_rtcp_tests.gypi',
         'rtp_rtcp/test/test_bwe/test_bwe.gypi',