diff --git a/platform/fwk/Makefile b/platform/fwk/Makefile
index 99c37c8..9e38125 100644
--- a/platform/fwk/Makefile
+++ b/platform/fwk/Makefile
@@ -14,8 +14,9 @@
 
 include drivers/hdf/khdf/platform/platform.mk
 
-obj-y  += $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/fwk/platform_device.o \
-          $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/fwk/platform_common.o \
+obj-y  += $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/fwk/platform_common.o \
+          $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/fwk/platform_device.o \
+          $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/fwk/platform_event.o \
 	  $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/fwk/platform_manager.o \
 	  $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/fwk/platform_queue.o
 
diff --git a/test/Makefile b/test/Makefile
index fca1a01..ac8b9e3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -25,6 +25,13 @@ obj-y  += $(HDF_FRAMWORK_TEST_ROOT)/common/hdf_main_test.o \
           $(HDF_FRAMWORK_TEST_ROOT)/utils/hcs_parser/unittest/hcs_parser_test.o \
           $(HDF_FRAMWORK_TEST_ROOT)/pm/hdf_pm_driver_test.o
 
+obj-$(CONFIG_DRIVERS_HDF_PLATFORM) += $(HDF_FRAMWORK_TEST_ROOT)/platform/common/platform_device_test.o \
+                                      $(HDF_FRAMWORK_TEST_ROOT)/platform/common/platform_driver_test.o \
+                                      $(HDF_FRAMWORK_TEST_ROOT)/platform/common/platform_event_test.o \
+                                      $(HDF_FRAMWORK_TEST_ROOT)/platform/common/platform_manager_test.o \
+                                      $(HDF_FRAMWORK_TEST_ROOT)/platform/common/platform_queue_test.o \
+                                      $(HDF_FRAMWORK_TEST_ROOT)/platform/entry/hdf_platform_core_entry_test.o
+
 obj-$(CONFIG_DRIVERS_HDF_PLATFORM_GPIO) += $(HDF_FRAMWORK_TEST_ROOT)/platform/common/gpio_test.o \
 	                                   $(HDF_FRAMWORK_TEST_ROOT)/platform/common/gpio_driver_test.o \
                                            $(HDF_FRAMWORK_TEST_ROOT)/platform/entry/hdf_gpio_entry_test.o