diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn
index b20e3b5ad1..36f55756f8 100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -530,6 +530,7 @@ if (rtc_include_tests) {
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
       "../audio_coding:neteq_unittest_tools",
+      "test/conversational_speech:unittest",
       "//testing/gmock",
       "//testing/gtest",
     ]
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn b/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
index e85e1e3b1c..4375c4efb3 100644
--- a/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -12,7 +12,6 @@ group("conversational_speech") {
   testonly = true
   deps = [
     ":conversational_speech_generator",
-    ":conversational_speech_generator_unittest",
   ]
 }
 
@@ -27,8 +26,7 @@ rtc_executable("conversational_speech_generator") {
     "//webrtc/base:rtc_base_approved",
     "//webrtc/test:test_support",
   ]
-  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-}  # bin
+}
 
 rtc_static_library("lib") {
   testonly = true
@@ -42,18 +40,17 @@ rtc_static_library("lib") {
     "//webrtc/base:rtc_base_approved",
   ]
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
-}  # lib
+}
 
-rtc_test("conversational_speech_generator_unittest") {
+rtc_source_set("unittest") {
   testonly = true
-  deps = [
-    ":lib",
-    "//testing/gtest",
-    "//webrtc//base:rtc_base_tests_main",
-    "//webrtc/test:test_support",
-  ]
   sources = [
     "generator_unittest.cc",
   ]
-  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  deps = [
+    ":lib",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//webrtc/test:test_support",
+  ]
 }