diff --git a/src/modules/audio_coding/codecs/cng/cng.gypi b/src/modules/audio_coding/codecs/cng/cng.gypi
index d58520866d..2903cc22ed 100644
--- a/src/modules/audio_coding/codecs/cng/cng.gypi
+++ b/src/modules/audio_coding/codecs/cng/cng.gypi
@@ -38,6 +38,7 @@
           'type': 'executable',
           'dependencies': [
             'CNG',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
             '<(webrtc_root)/../test/test.gyp:test_support_main',
           ],
           'sources': [
diff --git a/src/modules/audio_coding/codecs/cng/cng_unittest.cc b/src/modules/audio_coding/codecs/cng/cng_unittest.cc
index 6099fc9df9..6a4edc0705 100644
--- a/src/modules/audio_coding/codecs/cng/cng_unittest.cc
+++ b/src/modules/audio_coding/codecs/cng/cng_unittest.cc
@@ -12,7 +12,6 @@
  * Empty test just to get code coverage metrics for this dir.
  */
 #include "webrtc_cng.h"
+#include "gtest/gtest.h"
 
-
-
-
+TEST(CngTest, EmptyTestToGetCodeCoverage) {}
diff --git a/src/modules/audio_coding/codecs/g711/g711.gypi b/src/modules/audio_coding/codecs/g711/g711.gypi
index 0b5768c431..2abc7323e3 100644
--- a/src/modules/audio_coding/codecs/g711/g711.gypi
+++ b/src/modules/audio_coding/codecs/g711/g711.gypi
@@ -37,6 +37,7 @@
           'dependencies': [
             'G711',
             '<(webrtc_root)/../test/test.gyp:test_support_main',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'g711_unittest.cc',
diff --git a/src/modules/audio_coding/codecs/g711/g711_unittest.cc b/src/modules/audio_coding/codecs/g711/g711_unittest.cc
index f5522556f4..c903bed77d 100644
--- a/src/modules/audio_coding/codecs/g711/g711_unittest.cc
+++ b/src/modules/audio_coding/codecs/g711/g711_unittest.cc
@@ -12,7 +12,6 @@
  * Empty test just to get code coverage metrics for this dir.
  */
 #include "g711_interface.h"
+#include "gtest/gtest.h"
 
-
-
-
+TEST(G711Test, EmptyTestToGetCodeCoverage) {}
diff --git a/src/modules/audio_coding/codecs/g722/g722.gypi b/src/modules/audio_coding/codecs/g722/g722.gypi
index 79c94f8c10..b4d47b19be 100644
--- a/src/modules/audio_coding/codecs/g722/g722.gypi
+++ b/src/modules/audio_coding/codecs/g722/g722.gypi
@@ -37,6 +37,7 @@
           'dependencies': [
             'G722',
             '<(webrtc_root)/../test/test.gyp:test_support_main',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'g722_unittest.cc',
diff --git a/src/modules/audio_coding/codecs/g722/g722_unittest.cc b/src/modules/audio_coding/codecs/g722/g722_unittest.cc
index 85c8baae77..a828eddbe5 100644
--- a/src/modules/audio_coding/codecs/g722/g722_unittest.cc
+++ b/src/modules/audio_coding/codecs/g722/g722_unittest.cc
@@ -12,7 +12,6 @@
  * Empty test just to get code coverage metrics for this dir.
  */
 #include "g722_interface.h"
+#include "gtest/gtest.h"
 
-
-
-
+TEST(G722Test, EmptyTestToGetCodeCoverage) {}
diff --git a/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
index ec917751e8..38754e6851 100644
--- a/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
+++ b/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
@@ -34,6 +34,7 @@
           'dependencies': [
             'PCM16B',
             '<(webrtc_root)/../test/test.gyp:test_support_main',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'pcm16b_unittest.cc',
diff --git a/src/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc b/src/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc
index 556741eff9..eb910b363e 100644
--- a/src/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc
+++ b/src/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc
@@ -12,7 +12,6 @@
  * Empty test just to get code coverage metrics for this dir.
  */
 #include "pcm16b.h"
+#include "gtest/gtest.h"
 
-
-
-
+TEST(Pcm16bTest, EmptyTestToGetCodeCoverage) {}