diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn
index 645b4100e0..531f7eee67 100644
--- a/interfaces/inner_api/ability_manager/BUILD.gn
+++ b/interfaces/inner_api/ability_manager/BUILD.gn
@@ -71,11 +71,8 @@ ohos_shared_library("ability_manager") {
     "${ability_runtime_native_path}/ability/native/task_handler_client.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_auto_startup_client.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_manager_client.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_manager_collaborator_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_manager_proxy.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_manager_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_running_info.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_scheduler_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_scheduler_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/acquire_share_data_callback_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/acquire_share_data_callback_stub.cpp",
@@ -90,12 +87,10 @@ ohos_shared_library("ability_manager") {
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/launch_param.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/lifecycle_state_info.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/mission_listener_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/mission_listener_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/open_link/open_link_options.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/prepare_terminate_callback_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/prepare_terminate_callback_stub.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/remote_mission_listener_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/remote_mission_listener_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/remote_on_listener_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/remote_on_listener_stub.cpp",
@@ -111,7 +106,6 @@ ohos_shared_library("ability_manager") {
     "${ability_runtime_services_path}/abilitymgr/src/want_sender_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/want_sender_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/wants_info.cpp",
-    "${ability_runtime_services_path}/common/src/ability_manager_radar.cpp",
     "src/status_bar_delegate/status_bar_delegate_proxy.cpp",
     "src/status_bar_delegate/status_bar_delegate_stub.cpp",
     "src/window_manager_service_handler_proxy.cpp",
diff --git a/interfaces/inner_api/ability_manager/include/open_link_options.h b/interfaces/inner_api/ability_manager/include/open_link_options.h
index fb066fdcfc..f01875662f 100644
--- a/interfaces/inner_api/ability_manager/include/open_link_options.h
+++ b/interfaces/inner_api/ability_manager/include/open_link_options.h
@@ -23,7 +23,7 @@
 #include "want.h"
 namespace OHOS {
 namespace AAFwk {
-class OpenLinkOptions final : public Parcelable, public std::enable_shared_from_this<OpenLinkOptions> {
+class OpenLinkOptions final : public Parcelable {
 public:
     OpenLinkOptions() = default;
     virtual ~OpenLinkOptions() = default;
diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni
index 0594e38f2d..6a9b08770b 100644
--- a/services/abilitymgr/abilitymgr.gni
+++ b/services/abilitymgr/abilitymgr.gni
@@ -23,10 +23,8 @@ abilityms_files = [
   "src/disposed_observer.cpp",
   "src/ability_manager_service.cpp",
   "src/ability_manager_stub.cpp",
-  "src/ability_manager_proxy.cpp",
   "src/ability_record.cpp",
   "src/ability_manager_collaborator_proxy.cpp",
-  "src/ability_scheduler_stub.cpp",
   "src/ability_scheduler_proxy.cpp",
   "src/ability_token_stub.cpp",
   "src/app_scheduler.cpp",
@@ -51,7 +49,6 @@ abilityms_files = [
   "src/want_sender_info.cpp",
   "src/pending_want_record.cpp",
   "src/want_receiver_proxy.cpp",
-  "src/want_receiver_stub.cpp",
   "src/want_sender_proxy.cpp",
   "src/want_sender_stub.cpp",
   "src/pending_want_key.cpp",
@@ -85,7 +82,6 @@ abilityms_files = [
   "src/ui_extension_record_factory.cpp",
   "src/start_options.cpp",
   "src/user_callback_proxy.cpp",
-  "src/user_callback_stub.cpp",
   "src/call_container.cpp",
   "src/call_record.cpp",
   "src/inner_mission_info.cpp",
@@ -94,17 +90,14 @@ abilityms_files = [
   "src/mission_info_mgr.cpp",
   "src/mission_listener_controller.cpp",
   "src/mission_listener_proxy.cpp",
-  "src/mission_listener_stub.cpp",
   "src/rdb/ability_resident_process_rdb.cpp",
   "src/rdb/parser_util.cpp",
   "src/rdb/rdb_data_manager.cpp",
   "src/remote_mission_listener_proxy.cpp",
-  "src/remote_mission_listener_stub.cpp",
   "src/mission_list_manager.cpp",
   "src/mission_list.cpp",
   "src/scene_board/status_bar_delegate_manager.cpp",
   "src/scene_board/ui_ability_lifecycle_manager.cpp",
-  "src/open_link/open_link_options.cpp",
   "src/deeplink_reserve/deeplink_reserve.cpp",
 
   #connection observer
diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp
index 37058440a1..968c4b7ba3 100644
--- a/services/abilitymgr/src/ability_manager_proxy.cpp
+++ b/services/abilitymgr/src/ability_manager_proxy.cpp
@@ -22,7 +22,6 @@
 #include "ability_connect_callback_proxy.h"
 #include "ability_connect_callback_stub.h"
 #include "ability_manager_errors.h"
-#include "ability_scheduler_proxy.h"
 #include "ability_scheduler_stub.h"
 #include "ability_util.h"
 #include "appexecfwk_errors.h"
@@ -656,12 +655,12 @@ int AbilityManagerProxy::PreloadUIExtensionAbility(const Want &want, std::string
     }
 
     PROXY_WRITE_PARCEL_AND_RETURN_IF_FAIL(data, Parcelable, &want);
-    
+
     if (!data.WriteString16(Str8ToStr16(hostBundleName))) {
         TAG_LOGE(AAFwkTag::ABILITYMGR, "hostBundleName write failed.");
         return ERR_INVALID_VALUE;
     }
-    
+
     PROXY_WRITE_PARCEL_AND_RETURN_IF_FAIL(data, Int32, userId);
     int error;
     MessageParcel reply;
diff --git a/test/moduletest/ability_caller_fw_module_test/BUILD.gn b/test/moduletest/ability_caller_fw_module_test/BUILD.gn
index d2d01a8854..bd8e07e143 100644
--- a/test/moduletest/ability_caller_fw_module_test/BUILD.gn
+++ b/test/moduletest/ability_caller_fw_module_test/BUILD.gn
@@ -40,6 +40,7 @@ ohos_moduletest("ability_caller_fw_module_test") {
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
diff --git a/test/moduletest/ability_delegator_test/BUILD.gn b/test/moduletest/ability_delegator_test/BUILD.gn
index 092388dfe1..b947701f80 100644
--- a/test/moduletest/ability_delegator_test/BUILD.gn
+++ b/test/moduletest/ability_delegator_test/BUILD.gn
@@ -148,6 +148,7 @@ ohos_moduletest("iability_monitor_moduletest") {
   deps = [
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/appkit:appkit_delegator",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/test/moduletest/ability_record_test/BUILD.gn b/test/moduletest/ability_record_test/BUILD.gn
index eeaa790118..cfe8f2b280 100644
--- a/test/moduletest/ability_record_test/BUILD.gn
+++ b/test/moduletest/ability_record_test/BUILD.gn
@@ -38,6 +38,7 @@ ohos_moduletest("AbilityRecordModuleTest") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/app_manager:app_manager",
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
diff --git a/test/moduletest/ability_test/BUILD.gn b/test/moduletest/ability_test/BUILD.gn
index eb0180109b..304b07d7ac 100644
--- a/test/moduletest/ability_test/BUILD.gn
+++ b/test/moduletest/ability_test/BUILD.gn
@@ -263,6 +263,7 @@ ohos_moduletest("data_ability_helper_module_test") {
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/ability/native:data_ability_helper",
     "${ability_runtime_native_path}/appkit:appkit_native",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/test/unittest/ability_manager_stub_test/BUILD.gn b/test/unittest/ability_manager_stub_test/BUILD.gn
index 2b138e56a5..a95f730f6f 100644
--- a/test/unittest/ability_manager_stub_test/BUILD.gn
+++ b/test/unittest/ability_manager_stub_test/BUILD.gn
@@ -46,6 +46,7 @@ ohos_unittest("ability_manager_stub_test") {
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
 
     # "${ability_runtime_path}/utils/global/freeze:freeze_util",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/common:perm_verification",
     "${ability_runtime_services_path}/common:task_handler_wrap",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock",
diff --git a/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn b/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn
index 2cef963d23..ff47f134bd 100644
--- a/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn
+++ b/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn
@@ -44,6 +44,7 @@ ohos_unittest("ability_context_impl_test") {
     "${ability_runtime_innerkits_path}/ability_manager:mission_info",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "${global_path}/resource_management/frameworks/resmgr:global_resmgr",
     "//third_party/googletest:gmock_main",
@@ -103,6 +104,7 @@ ohos_unittest("local_call_container_ut_test") {
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
@@ -134,6 +136,7 @@ ohos_unittest("local_call_record_ut_test") {
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
diff --git a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn
index 7a0f68d3d9..4d927bcfed 100644
--- a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn
+++ b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn
@@ -270,6 +270,7 @@ ohos_unittest("ability_context_test") {
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/appkit:app_context",
     "${ability_runtime_native_path}/appkit:appkit_native",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
@@ -1609,6 +1610,7 @@ ohos_unittest("ability_permission_test") {
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/appkit:app_context",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "${global_path}/resource_management/frameworks/resmgr:global_resmgr",
     "//third_party/googletest:gmock_main",
diff --git a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn
index e2a1a8515a..c0eb7513d9 100644
--- a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn
+++ b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn
@@ -96,6 +96,7 @@ ohos_unittest("iability_monitor_unittest") {
   deps = [
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/appkit:appkit_delegator",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/test/unittest/mission_listener_stub_test/BUILD.gn b/test/unittest/mission_listener_stub_test/BUILD.gn
index 7fb38630ea..3f9d1bdca5 100755
--- a/test/unittest/mission_listener_stub_test/BUILD.gn
+++ b/test/unittest/mission_listener_stub_test/BUILD.gn
@@ -29,6 +29,7 @@ ohos_unittest("mission_listener_stub_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
diff --git a/test/unittest/mission_listener_test/BUILD.gn b/test/unittest/mission_listener_test/BUILD.gn
index e43c2d92ad..53ae6f859c 100644
--- a/test/unittest/mission_listener_test/BUILD.gn
+++ b/test/unittest/mission_listener_test/BUILD.gn
@@ -39,6 +39,7 @@ ohos_unittest("mission_listener_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/common:perm_verification",
diff --git a/test/unittest/sender_info_test/BUILD.gn b/test/unittest/sender_info_test/BUILD.gn
index 1d9773cba0..42338c58b6 100644
--- a/test/unittest/sender_info_test/BUILD.gn
+++ b/test/unittest/sender_info_test/BUILD.gn
@@ -36,6 +36,7 @@ ohos_unittest("sender_info_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/common:perm_verification",
diff --git a/test/unittest/stop_user_callback_stub_test/BUILD.gn b/test/unittest/stop_user_callback_stub_test/BUILD.gn
index ffe696806f..d5d6357461 100644
--- a/test/unittest/stop_user_callback_stub_test/BUILD.gn
+++ b/test/unittest/stop_user_callback_stub_test/BUILD.gn
@@ -39,6 +39,7 @@ ohos_unittest("stop_user_callback_stub_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/common:perm_verification",
diff --git a/test/unittest/sys_mgr_client_test/BUILD.gn b/test/unittest/sys_mgr_client_test/BUILD.gn
index 9c00fe4555..f83e76ed93 100644
--- a/test/unittest/sys_mgr_client_test/BUILD.gn
+++ b/test/unittest/sys_mgr_client_test/BUILD.gn
@@ -38,6 +38,7 @@ ohos_unittest("sys_mgr_client_test") {
 
   deps = [
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/test/unittest/user_controller_test/BUILD.gn b/test/unittest/user_controller_test/BUILD.gn
index 0942a2072a..7ae6de84ed 100644
--- a/test/unittest/user_controller_test/BUILD.gn
+++ b/test/unittest/user_controller_test/BUILD.gn
@@ -24,6 +24,7 @@ ohos_unittest("user_controller_test") {
   configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ]
 
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/common:perm_verification",
   ]
diff --git a/test/unittest/want_receiver_stub_test/BUILD.gn b/test/unittest/want_receiver_stub_test/BUILD.gn
index 4191f3d604..3cd0a69ab2 100644
--- a/test/unittest/want_receiver_stub_test/BUILD.gn
+++ b/test/unittest/want_receiver_stub_test/BUILD.gn
@@ -39,6 +39,7 @@ ohos_unittest("want_receiver_stub_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/common:perm_verification",
diff --git a/tools/test/moduletest/aa/BUILD.gn b/tools/test/moduletest/aa/BUILD.gn
index d8238c0b5a..fa265c6b35 100644
--- a/tools/test/moduletest/aa/BUILD.gn
+++ b/tools/test/moduletest/aa/BUILD.gn
@@ -41,6 +41,7 @@ ohos_moduletest("aa_command_dumpsys_module_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -69,6 +70,7 @@ ohos_moduletest("aa_command_start_module_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -96,6 +98,7 @@ ohos_moduletest("aa_command_stop_service_module_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -123,6 +126,7 @@ ohos_moduletest("aa_command_dump_module_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/tools/test/moduletest/ability_delegator/BUILD.gn b/tools/test/moduletest/ability_delegator/BUILD.gn
index 9a581cc8fe..0bc2173fcf 100644
--- a/tools/test/moduletest/ability_delegator/BUILD.gn
+++ b/tools/test/moduletest/ability_delegator/BUILD.gn
@@ -37,6 +37,7 @@ ohos_moduletest("ability_command_module_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -59,6 +60,7 @@ ohos_moduletest("test_observer_module_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/tools/test/unittest/aa/BUILD.gn b/tools/test/unittest/aa/BUILD.gn
index 845ea6e645..9227f8570e 100644
--- a/tools/test/unittest/aa/BUILD.gn
+++ b/tools/test/unittest/aa/BUILD.gn
@@ -41,6 +41,7 @@ ohos_unittest("aa_command_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -68,6 +69,7 @@ ohos_unittest("aa_command_start_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -95,6 +97,7 @@ ohos_unittest("aa_command_stop_service_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -122,6 +125,7 @@ ohos_unittest("aa_command_dump_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -149,6 +153,7 @@ ohos_unittest("aa_command_dumpsys_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -176,6 +181,7 @@ ohos_unittest("aa_command_screen_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -203,6 +209,7 @@ ohos_unittest("aa_command_force_stop_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -230,6 +237,7 @@ ohos_unittest("aa_command_force_timeout_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -257,6 +265,7 @@ ohos_unittest("aa_command_test_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/tools/test/unittest/ability_delegator/BUILD.gn b/tools/test/unittest/ability_delegator/BUILD.gn
index da5de7dde6..89bac2271e 100644
--- a/tools/test/unittest/ability_delegator/BUILD.gn
+++ b/tools/test/unittest/ability_delegator/BUILD.gn
@@ -38,6 +38,7 @@ ohos_unittest("ability_command_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -60,6 +61,7 @@ ohos_unittest("test_observer_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/tools/test/unittest/ability_tool/BUILD.gn b/tools/test/unittest/ability_tool/BUILD.gn
index c37d7e4e1b..f4e87fd465 100644
--- a/tools/test/unittest/ability_tool/BUILD.gn
+++ b/tools/test/unittest/ability_tool/BUILD.gn
@@ -41,6 +41,7 @@ ohos_unittest("ability_tool_test") {
 
   deps = [
     "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "${ability_runtime_services_path}/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]