diff --git a/media/BUILD.gn b/media/BUILD.gn
index cf843bc932..cc48b069ad 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -537,6 +537,7 @@ if (rtc_include_tests) {
       ":rtc_audio_video",
       ":rtc_constants",
       ":rtc_data",
+      "../api/test/video:function_video_factory",
       "../api/units:time_delta",
       "../api/video:video_frame_i420",
       "../modules/audio_processing:mocks",
@@ -549,7 +550,6 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_task_queue",
       "../rtc_base:stringutils",
       "../test:field_trial",
-      "../test:test_common",
       "//third_party/abseil-cpp/absl/memory",
     ]
     sources = [
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 85c946337c..354be7278c 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -15,6 +15,8 @@
 #include "absl/memory/memory.h"
 #include "api/test/create_simulcast_test_fixture.h"
 #include "api/test/simulcast_test_fixture.h"
+#include "api/test/video/function_video_decoder_factory.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "common_video/include/video_frame_buffer.h"
@@ -24,8 +26,6 @@
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
-#include "test/function_video_decoder_factory.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 27f7f3d646..b92f775ddc 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -710,6 +710,7 @@ if (rtc_include_tests) {
       ":webrtc_vp9_helpers",
       "../..:webrtc_common",
       "../../api:videocodec_test_fixture_api",
+      "../../api/test/video:function_video_factory",
       "../../api/video_codecs:video_codecs_api",
       "../../call:video_stream_api",
       "../../common_video",
@@ -770,6 +771,7 @@ if (rtc_include_tests) {
       "../../api:mock_video_decoder",
       "../../api:mock_video_encoder",
       "../../api:videocodec_test_fixture_api",
+      "../../api/test/video:function_video_factory",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
       "../../api/video_codecs:rtc_software_fallback_wrappers",
@@ -783,7 +785,6 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base",
       "../../test:field_trial",
       "../../test:fileutils",
-      "../../test:test_common",
       "../../test:test_support",
       "../../test:video_test_common",
       "../rtp_rtcp:rtp_rtcp_format",
@@ -893,6 +894,7 @@ if (rtc_include_tests) {
       "../../api:mock_video_encoder",
       "../../api:simulcast_test_fixture_api",
       "../../api:videocodec_test_fixture_api",
+      "../../api/test/video:function_video_factory",
       "../../api/video:video_bitrate_allocator",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
diff --git a/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc b/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
index 6c6fae8c1a..3b720b3843 100644
--- a/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
+++ b/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
@@ -13,9 +13,9 @@
 #include "absl/memory/memory.h"
 #include "api/test/create_simulcast_test_fixture.h"
 #include "api/test/simulcast_test_fixture.h"
+#include "api/test/video/function_video_decoder_factory.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
-#include "test/function_video_decoder_factory.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
index bdd3e6c2dd..810d008559 100644
--- a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
@@ -12,6 +12,7 @@
 
 #include "absl/memory/memory.h"
 #include "api/test/create_videocodec_test_fixture.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "media/base/mediaconstants.h"
 #include "media/engine/internaldecoderfactory.h"
@@ -19,7 +20,6 @@
 #include "media/engine/simulcast_encoder_adapter.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"
 
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
index 5f974d643b..d493e2aceb 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
@@ -13,9 +13,9 @@
 #include "absl/memory/memory.h"
 #include "api/test/create_simulcast_test_fixture.h"
 #include "api/test/simulcast_test_fixture.h"
+#include "api/test/video/function_video_decoder_factory.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
-#include "test/function_video_decoder_factory.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 8ba4ec577c..29d577445c 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -326,6 +326,7 @@ if (rtc_include_tests) {
       ":video_test_support",
       "../api:create_simulcast_test_fixture_api",
       "../api:simulcast_test_fixture_api",
+      "../api/test/video:function_video_factory",
       "../api/video:video_frame_i420",
       "../modules/rtp_rtcp:rtp_rtcp",
       "../modules/video_capture",
@@ -623,8 +624,6 @@ rtc_source_set("test_common") {
     "encoder_settings.cc",
     "encoder_settings.h",
     "fake_videorenderer.h",
-    "function_video_decoder_factory.h",
-    "function_video_encoder_factory.h",
     "layer_filtering_transport.cc",
     "layer_filtering_transport.h",
     "mock_transport.cc",
diff --git a/test/call_test.h b/test/call_test.h
index 7a5c3e9b8c..8bd87e41a9 100644
--- a/test/call_test.h
+++ b/test/call_test.h
@@ -13,6 +13,8 @@
 #include <memory>
 #include <vector>
 
+#include "api/test/video/function_video_decoder_factory.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "call/call.h"
 #include "call/rtp_transport_controller_send.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
@@ -22,8 +24,6 @@
 #include "test/fake_videorenderer.h"
 #include "test/fake_vp8_encoder.h"
 #include "test/frame_generator_capturer.h"
-#include "test/function_video_decoder_factory.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/rtp_rtcp_observer.h"
 #include "test/single_threaded_task_queue.h"
 
diff --git a/test/fake_vp8_encoder_unittest.cc b/test/fake_vp8_encoder_unittest.cc
index d881edcaab..4e576fe9c9 100644
--- a/test/fake_vp8_encoder_unittest.cc
+++ b/test/fake_vp8_encoder_unittest.cc
@@ -14,11 +14,11 @@
 #include "absl/memory/memory.h"
 #include "api/test/create_simulcast_test_fixture.h"
 #include "api/test/simulcast_test_fixture.h"
+#include "api/test/video/function_video_decoder_factory.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
 #include "test/fake_vp8_decoder.h"
 #include "test/fake_vp8_encoder.h"
-#include "test/function_video_decoder_factory.h"
-#include "test/function_video_encoder_factory.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/function_video_decoder_factory.h b/test/function_video_decoder_factory.h
deleted file mode 100644
index 613bf89e63..0000000000
--- a/test/function_video_decoder_factory.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef TEST_FUNCTION_VIDEO_DECODER_FACTORY_H_
-#define TEST_FUNCTION_VIDEO_DECODER_FACTORY_H_
-
-// TODO(danilchap): Remove this file when all users include api header directly.
-#include "api/test/video/function_video_decoder_factory.h"
-
-#endif  // TEST_FUNCTION_VIDEO_DECODER_FACTORY_H_
diff --git a/test/function_video_encoder_factory.h b/test/function_video_encoder_factory.h
deleted file mode 100644
index 70ddce57d2..0000000000
--- a/test/function_video_encoder_factory.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef TEST_FUNCTION_VIDEO_ENCODER_FACTORY_H_
-#define TEST_FUNCTION_VIDEO_ENCODER_FACTORY_H_
-
-// TODO(danilchap): Remove this file when all users include api header directly.
-#include "api/test/video/function_video_encoder_factory.h"
-
-#endif  // TEST_FUNCTION_VIDEO_ENCODER_FACTORY_H_
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 9cb1b0daec..3e61af311d 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -42,6 +42,7 @@ if (rtc_include_tests) {
       "../../api:transport_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../api/audio_codecs:builtin_audio_encoder_factory",
+      "../../api/test/video:function_video_factory",
       "../../api/units:data_rate",
       "../../api/units:time_delta",
       "../../api/units:timestamp",
diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc
index 914d981908..071ce0a391 100644
--- a/test/scenario/video_stream.cc
+++ b/test/scenario/video_stream.cc
@@ -12,13 +12,13 @@
 #include <algorithm>
 #include <utility>
 
+#include "api/test/video/function_video_encoder_factory.h"
 #include "media/base/mediaconstants.h"
 #include "media/engine/internaldecoderfactory.h"
 #include "media/engine/internalencoderfactory.h"
 #include "media/engine/webrtcvideoengine.h"
 #include "test/call_test.h"
 #include "test/fake_encoder.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/scenario/hardware_codecs.h"
 #include "test/testsupport/fileutils.h"
 
diff --git a/video/BUILD.gn b/video/BUILD.gn
index a00290763e..dc715d1928 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -353,6 +353,7 @@ if (rtc_include_tests) {
     ]
     deps = [
       "..:webrtc_common",
+      "../api/test/video:function_video_factory",
       "../api/video_codecs:video_codecs_api",
       "../call:call_interfaces",
       "../common_video",
@@ -426,6 +427,7 @@ if (rtc_include_tests) {
       ":video_mocks",
       ":video_stream_encoder_impl",
       "../api:simulated_network_api",
+      "../api/test/video:function_video_factory",
       "../api/video:encoded_image",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
diff --git a/video/end_to_end_tests/codec_tests.cc b/video/end_to_end_tests/codec_tests.cc
index fad3ac7ede..0fd0399b01 100644
--- a/video/end_to_end_tests/codec_tests.cc
+++ b/video/end_to_end_tests/codec_tests.cc
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/test/video/function_video_encoder_factory.h"
 #include "media/engine/internaldecoderfactory.h"
 #include "media/engine/internalencoderfactory.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
@@ -18,7 +19,6 @@
 #include "test/call_test.h"
 #include "test/encoder_settings.h"
 #include "test/field_trial.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/video/end_to_end_tests/fec_tests.cc b/video/end_to_end_tests/fec_tests.cc
index ab50386854..278a2879f4 100644
--- a/video/end_to_end_tests/fec_tests.cc
+++ b/video/end_to_end_tests/fec_tests.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/test/simulated_network.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
 #include "media/engine/internaldecoderfactory.h"
@@ -16,7 +17,6 @@
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "test/call_test.h"
 #include "test/field_trial.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 #include "test/rtcp_packet_parser.h"
 
diff --git a/video/end_to_end_tests/histogram_tests.cc b/video/end_to_end_tests/histogram_tests.cc
index a4aa0c810a..312924c986 100644
--- a/video/end_to_end_tests/histogram_tests.cc
+++ b/video/end_to_end_tests/histogram_tests.cc
@@ -9,10 +9,10 @@
  */
 
 #include "absl/types/optional.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "system_wrappers/include/metrics.h"
 #include "test/call_test.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/video/end_to_end_tests/multi_codec_receive_tests.cc b/video/end_to_end_tests/multi_codec_receive_tests.cc
index 338e7a1bf2..c58f0fe16a 100644
--- a/video/end_to_end_tests/multi_codec_receive_tests.cc
+++ b/video/end_to_end_tests/multi_codec_receive_tests.cc
@@ -9,13 +9,13 @@
  */
 
 #include "api/test/simulated_network.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 #include "test/call_test.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/video/end_to_end_tests/multi_stream_tester.cc b/video/end_to_end_tests/multi_stream_tester.cc
index 363597ae00..4590c25dcb 100644
--- a/video/end_to_end_tests/multi_stream_tester.cc
+++ b/video/end_to_end_tests/multi_stream_tester.cc
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "api/test/simulated_network.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
@@ -22,7 +23,6 @@
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "test/call_test.h"
 #include "test/encoder_settings.h"
-#include "test/function_video_encoder_factory.h"
 
 namespace webrtc {
 
diff --git a/video/end_to_end_tests/retransmission_tests.cc b/video/end_to_end_tests/retransmission_tests.cc
index 11d84a32bc..b8d2d9a694 100644
--- a/video/end_to_end_tests/retransmission_tests.cc
+++ b/video/end_to_end_tests/retransmission_tests.cc
@@ -9,13 +9,13 @@
  */
 
 #include "api/test/simulated_network.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/call_test.h"
 #include "test/field_trial.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 #include "test/rtcp_packet_parser.h"
 
diff --git a/video/end_to_end_tests/stats_tests.cc b/video/end_to_end_tests/stats_tests.cc
index 4c44d176f6..56655714df 100644
--- a/video/end_to_end_tests/stats_tests.cc
+++ b/video/end_to_end_tests/stats_tests.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/test/simulated_network.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
 #include "modules/rtp_rtcp/source/rtp_utility.h"
@@ -18,7 +19,6 @@
 #include "system_wrappers/include/sleep.h"
 #include "test/call_test.h"
 #include "test/fake_encoder.h"
-#include "test/function_video_encoder_factory.h"
 #include "test/gtest.h"
 #include "test/rtcp_packet_parser.h"
 
diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc
index 449e0763a2..6ce0c99ffe 100644
--- a/video/picture_id_tests.cc
+++ b/video/picture_id_tests.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/test/simulated_network.h"
+#include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
 #include "media/engine/internalencoderfactory.h"
@@ -19,7 +20,6 @@
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "test/call_test.h"
-#include "test/function_video_encoder_factory.h"
 
 namespace webrtc {
 namespace {
diff --git a/video/quality_scaling_tests.cc b/video/quality_scaling_tests.cc
index 9b1d0faeff..16ae0f2cc3 100644
--- a/video/quality_scaling_tests.cc
+++ b/video/quality_scaling_tests.cc
@@ -10,6 +10,7 @@
 
 #include <string>
 
+#include "api/test/video/function_video_encoder_factory.h"
 #include "media/engine/internalencoderfactory.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
@@ -17,7 +18,6 @@
 #include "test/call_test.h"
 #include "test/field_trial.h"
 #include "test/frame_generator_capturer.h"
-#include "test/function_video_encoder_factory.h"
 
 namespace webrtc {
 namespace {
diff --git a/video/replay.cc b/video/replay.cc
index a3fd1753b5..2c1c8a55ad 100644
--- a/video/replay.cc
+++ b/video/replay.cc
@@ -15,6 +15,7 @@
 #include <memory>
 #include <sstream>
 
+#include "api/test/video/function_video_decoder_factory.h"
 #include "api/video_codecs/video_decoder.h"
 #include "call/call.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
@@ -32,7 +33,6 @@
 #include "test/call_test.h"
 #include "test/encoder_settings.h"
 #include "test/fake_decoder.h"
-#include "test/function_video_decoder_factory.h"
 #include "test/gtest.h"
 #include "test/null_transport.h"
 #include "test/rtp_file_reader.h"