diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
index bb316e8a81..004556941b 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
@@ -30,7 +30,8 @@
           'type': 'executable',
           'dependencies': [
             '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
-            '<(webrtc_root)/test/test.gyp:test_support_main',
+            '<(webrtc_root)/test/test.gyp:test_support',
+            '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
             'rtc_event_log_source',
             'neteq',
             'neteq_unittest_tools',
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
index 756a9cf3f0..38ab2e9ba4 100644
--- a/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
@@ -368,9 +368,7 @@ size_t ReplacePayload(InputAudioFile* replacement_audio_file,
   return payload_len;
 }
 
-}  // namespace
-
-int main(int argc, char* argv[]) {
+int RunTest(int argc, char* argv[]) {
   static const int kOutputBlockSizeMs = 10;
 
   std::string program_name = argv[0];
@@ -632,5 +630,10 @@ int main(int argc, char* argv[]) {
   return 0;
 }
 
+}  // namespace
 }  // namespace test
 }  // namespace webrtc
+
+int main(int argc, char* argv[]) {
+  webrtc::test::RunTest(argc, argv);
+}