diff --git a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn
index 4a669037b1aa46cfb2ead04b5735d99ad027fa59..38fe7317d18351bf18527e368c3307c96a49fde0 100644
--- a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn
+++ b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn
@@ -57,12 +57,9 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
@@ -113,6 +110,7 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") {
   external_deps = [
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "ipc:ipc_core",
diff --git a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn
index 81c5b2a5f5570f3ae5d1b0ff4b3f925939b93001..69548dff3989602495853b3a50033ada929c0dfc 100644
--- a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn
+++ b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn
@@ -55,12 +55,9 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn
index ada13c730ce4bd3504afdc0946d2be75f2a4ce4e..d439df5b0ede9dfd2471dee24fde78eaf78740b7 100644
--- a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn
@@ -55,12 +55,9 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn
index 52efb6e4bf38bd79344fc0256d2ad5c38337de33..d2fb15d646a747fc6f9535ffdb46236b0c62f164 100644
--- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn
@@ -56,12 +56,9 @@ ohos_fuzztest("IpcClientManagerFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn
index 02ed42753823b9793d54f0513962ce29ba555127..f5aace22f6bf5761f4d282e693cd75f8c130e75f 100644
--- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn
@@ -56,12 +56,9 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn
index 330bffd6bb0c9b2e32ac0d69739f20fdcb71e634..c4b3946c69236cf7d40417194bd4c40ac8ce2aba 100644
--- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn
@@ -56,12 +56,9 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn
index 804d2b453f07fa771b1ec450ec980adbc3a66430..d40e6c7cd98a8011cb43c366f58aa6f8240f2015 100644
--- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn
@@ -56,12 +56,9 @@ ohos_fuzztest("IpcServerListenerFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn
index dabc2a15f9ed9f972e9475d3922c56a9ac799f99..d23d8906e8d85eda1ccbbd2471a199d0efa3e31c 100644
--- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn
@@ -56,12 +56,9 @@ ohos_fuzztest("IpcServerStubFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn b/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn
index 1659eca5b8d68e376929e27edc5441ef365d73ad..19fa3fb396b8b9b8bc67b73b50aa70bbef37f4b3 100644
--- a/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn
+++ b/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn
@@ -56,12 +56,9 @@ ohos_fuzztest("NativeDevicemanagerJsFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index 67ec39b7ba18c1865e802cbb603c514e2baa9758..8d76c8f46054863e4b9f062bce0b530ff1e263a7 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -279,6 +279,11 @@ ohos_unittest("UTTest_profile_connector") {
   sources = [ "UTTest_profile_connector.cpp" ]
 
   deps = [ ":device_manager_test_common" ]
+  external_deps = [
+    "bundle_framework:appexecfwk_base",
+    "bundle_framework:appexecfwk_core",
+    "eventhandler:libeventhandler",
+  ]
 }
 
 ## UnitTest UTTest_profile_connector }}}
@@ -290,6 +295,12 @@ ohos_unittest("UTTest_device_profile_adapter") {
   sources = [ "UTTest_device_profile_adapter.cpp" ]
 
   deps = [ ":device_manager_test_common" ]
+
+  external_deps = [
+    "bundle_framework:appexecfwk_base",
+    "bundle_framework:appexecfwk_core",
+    "eventhandler:libeventhandler",
+  ]
 }
 
 ## UnitTest UTTest_device_profile_adapter }}}
@@ -477,12 +488,9 @@ config("device_manager_test_common_public_config") {
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
     "//foundation/distributedhardware/devicemanager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/distributedhardware/devicemanager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",