diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
index c7582f834a436c6bb8134f713a985847d00833bf..fb2a344024e77d00bab2cd96584541e8f136fb70 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
@@ -808,3 +808,7 @@ void dc_dmub_srv_log_diagnostic_data(struct dc_dmub_srv *dc_dmub_srv)
 		diag_data.is_cw0_enabled,
 		diag_data.is_cw6_enabled);
 }
+
+#if IS_ENABLED(CONFIG_DC_KUNIT_TEST)
+#include "../tests/dc/dc_dmub_srv_test.c"
+#endif
\ No newline at end of file
diff --git a/drivers/gpu/drm/amd/display/tests/dc/Makefile b/drivers/gpu/drm/amd/display/tests/dc/Makefile
index efe85fe63315259846f2cb0177d4c8c3cf5f5fdb..a89f5ca925ff40b94fc76c8f9027ee89d01d73bb 100644
--- a/drivers/gpu/drm/amd/display/tests/dc/Makefile
+++ b/drivers/gpu/drm/amd/display/tests/dc/Makefile
@@ -5,8 +5,9 @@
 
 CFLAGS_$(AMDDALPATH)/tests/dc/dc_dmub_srv_test.o := $(dmub_ccflags)
 
-DC_TESTS = dc_dmub_srv_test.o
-AMD_DISPLAY_FILES += $(addprefix $(AMDDALPATH)/tests/dc/,$(DC_TESTS))
+# NOT NEEDED, dc_dmub_srv_test.c included into dc_dmub_srv.c
+# DC_TESTS = dc_dmub_srv_test.o
+# AMD_DISPLAY_FILES += $(addprefix $(AMDDALPATH)/tests/dc/,$(DC_TESTS))
 
 DC_TEST_MODULES = dc_tests.o
 AMD_DAL_DC_TEST_MODULES = $(addprefix $(AMDDALPATH)/tests/dc/,$(DC_TEST_MODULES))
diff --git a/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.c b/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.c
index cc6c50c8e4bdada98d9ec28f16a1769d4fbabb9a..cadf12f49a7b54a6c33433a92a918b35a4115d27 100644
--- a/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.c
+++ b/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.c
@@ -8,7 +8,11 @@
 #include <drm/drm_util.h>
 #include "dc_dmub_srv_test.h"
 
-#include "../../dc/dc_dmub_srv.c"
+extern void populate_subvp_cmd_drr_info(
+		struct dc *dc,
+		struct pipe_ctx *subvp_pipe,
+		struct pipe_ctx *vblank_pipe,
+		struct dmub_cmd_fw_assisted_mclk_switch_pipe_data_v2 *pipe_data);
 
 void populate_subvp_cmd_drr_info_test(struct kunit *test)
 {
diff --git a/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.h b/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.h
index bbb9495d253c809b98a0ad174431d3fc2cc71b48..26f7fd6168259ef69270d95f462f8a88fb39d131 100644
--- a/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.h
+++ b/drivers/gpu/drm/amd/display/tests/dc/dc_dmub_srv_test.h
@@ -22,4 +22,4 @@ struct populate_subvp_cmd_drr_info_test_case {
     const uint8_t use_ramping;
 };
 
-void populate_subvp_cmd_drr_info_test(struct kunit *test);
+extern void populate_subvp_cmd_drr_info_test(struct kunit *test);