diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index a1c8fabf5..7508d80df 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -156,9 +156,14 @@ ifneq (,$(wildcard scenarios/$(SCENARIO_NAME)/pt_dev.c))
 C_SRCS += scenarios/$(SCENARIO_NAME)/pt_dev.c
 endif
 
+# ACPI parsing component
+# This part should be isolated from FuSa Cert
+ifeq ($(CONFIG_DMAR_PARSE_ENABLED),y)
+C_SRCS += acpi_parser/dmar_parse.c
+endif
+
 C_SRCS += boot/acpi.c
 C_SRCS += boot/dmar_info.c
-C_SRCS += boot/dmar_parse.c
 C_SRCS += boot/cmdline.c
 C_SRCS += boot/guest/vboot_wrapper.c
 C_SRCS += boot/guest/deprivilege_boot.c
diff --git a/hypervisor/boot/dmar_parse.c b/hypervisor/acpi_parser/dmar_parse.c
similarity index 99%
rename from hypervisor/boot/dmar_parse.c
rename to hypervisor/acpi_parser/dmar_parse.c
index 0329df155..2902c9971 100644
--- a/hypervisor/boot/dmar_parse.c
+++ b/hypervisor/acpi_parser/dmar_parse.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifdef CONFIG_DMAR_PARSE_ENABLED
 #include <types.h>
 #include <logmsg.h>
 #include <host_pm.h>
@@ -296,5 +295,3 @@ int32_t parse_dmar_table(struct dmar_info *plat_dmar_info)
 
 	return 0;
 }
-
-#endif