diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc
index 4e16dc8989..a8c405357b 100644
--- a/modules/audio_coding/test/EncodeDecodeTest.cc
+++ b/modules/audio_coding/test/EncodeDecodeTest.cc
@@ -16,6 +16,7 @@
 #include <sstream>  // no-presubmit-check TODO(webrtc:8982)
 
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/audio_format_conversion.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
@@ -74,7 +75,8 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream,
 
   sendCodec.channels = channels;
 
-  EXPECT_EQ(0, acm->RegisterSendCodec(sendCodec));
+  acm->SetEncoder(CreateBuiltinAudioEncoderFactory()->MakeAudioEncoder(
+      sendCodec.pltype, CodecInstToSdp(sendCodec), absl::nullopt));
   _packetization = new TestPacketization(rtpStream, sendCodec.plfreq);
   EXPECT_EQ(0, acm->RegisterTransportCallback(_packetization));
 
diff --git a/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc
index c5cb3963b3..da6ea1c54a 100644
--- a/modules/audio_coding/test/PacketLossTest.cc
+++ b/modules/audio_coding/test/PacketLossTest.cc
@@ -97,10 +97,13 @@ void SenderWithFEC::Setup(AudioCodingModule* acm,
 }
 
 bool SenderWithFEC::SetFEC(bool enable_fec) {
-  if (_acm->SetCodecFEC(enable_fec) == 0) {
-    return true;
-  }
-  return false;
+  bool success = false;
+  _acm->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* enc) {
+    if (*enc && (*enc)->SetFec(enable_fec)) {
+      success = true;
+    }
+  });
+  return success;
 }
 
 bool SenderWithFEC::SetPacketLossRate(int expected_loss_rate) {