diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 7779af5fb9..dcd4222dbf 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -1377,4 +1377,27 @@ if (rtc_include_tests) {
       configs -= [ "//build/config/clang:find_bad_constructs" ]
     }
   }
+
+  executable("neteq_opus_quality_test") {
+    testonly = true
+
+    sources = [
+      "neteq/test/neteq_opus_quality_test.cc",
+    ]
+
+    deps = [
+      ":neteq",
+      ":neteq_test_support",
+      ":webrtc_opus",
+      "../../test:test_support_main",
+      "//testing/gtest",
+      "//third_party/gflags",
+    ]
+
+    if (is_clang) {
+      # Suppress warnings from the Chromium Clang plugins
+      # (bugs.webrtc.org/163).
+      configs -= [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
 }
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
index d2379f09e0..eee586d1dd 100644
--- a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
@@ -276,6 +276,8 @@ GilbertElliotLoss::GilbertElliotLoss(double prob_trans_11, double prob_trans_01)
       uniform_loss_model_(new UniformLoss(0)) {
 }
 
+GilbertElliotLoss::~GilbertElliotLoss() {}
+
 bool GilbertElliotLoss::Lost() {
   // Simulate bursty channel (Gilbert model).
   // (1st order) Markov chain model with memory of the previous/last
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
index 11afe6886b..aa895ce769 100644
--- a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
@@ -51,6 +51,7 @@ class UniformLoss : public LossModel {
 class GilbertElliotLoss : public LossModel {
  public:
   GilbertElliotLoss(double prob_trans_11, double prob_trans_01);
+  ~GilbertElliotLoss() override;
   bool Lost() override;
 
  private:
@@ -68,7 +69,7 @@ class NetEqQualityTest : public ::testing::Test {
                    int in_sampling_khz,
                    int out_sampling_khz,
                    NetEqDecoder decoder_type);
-  virtual ~NetEqQualityTest();
+  ~NetEqQualityTest() override;
 
   void SetUp() override;