diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index f90d8ec252..cc58772b21 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -31,6 +31,7 @@
 #include "media/engine/internal_encoder_factory.h"
 #include "media/engine/simulcast_encoder_adapter.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
+#include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/test_audio_device.h"
 #include "modules/audio_mixer/audio_mixer_impl.h"
 #include "modules/rtp_rtcp/source/rtp_packet.h"
@@ -206,7 +207,7 @@ void CallPerfTest::TestAudioVideoSync(FecMode fec,
 
   SendTask(task_queue(), [&]() {
     metrics::Reset();
-    rtc::scoped_refptr<TestAudioDeviceModule> fake_audio_device =
+    rtc::scoped_refptr<AudioDeviceModule> fake_audio_device =
         TestAudioDeviceModule::Create(
             task_queue_factory_.get(),
             TestAudioDeviceModule::CreatePulsedNoiseCapturer(256, 48000),
diff --git a/test/scenario/call_client.cc b/test/scenario/call_client.cc
index c80f58eeeb..d2019aebc7 100644
--- a/test/scenario/call_client.cc
+++ b/test/scenario/call_client.cc
@@ -19,6 +19,7 @@
 #include "api/transport/network_types.h"
 #include "call/call.h"
 #include "call/rtp_transport_controller_send_factory.h"
+#include "modules/audio_device/include/test_audio_device.h"
 #include "modules/audio_mixer/audio_mixer_impl.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
diff --git a/test/scenario/call_client.h b/test/scenario/call_client.h
index 5d62fc75e7..3717a7e796 100644
--- a/test/scenario/call_client.h
+++ b/test/scenario/call_client.h
@@ -22,7 +22,7 @@
 #include "api/test/time_controller.h"
 #include "api/units/data_rate.h"
 #include "call/call.h"
-#include "modules/audio_device/include/test_audio_device.h"
+#include "modules/audio_device/include/audio_device.h"
 #include "modules/congestion_controller/goog_cc/test/goog_cc_printer.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "rtc_base/task_queue_for_test.h"
@@ -96,7 +96,7 @@ class LoggingNetworkControllerFactory
 
 struct CallClientFakeAudio {
   rtc::scoped_refptr<AudioProcessing> apm;
-  rtc::scoped_refptr<TestAudioDeviceModule> fake_audio_device;
+  rtc::scoped_refptr<AudioDeviceModule> fake_audio_device;
   rtc::scoped_refptr<AudioState> audio_state;
 };
 // CallClient represents a participant in a call scenario. It is created by the