diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn
index cf945217ad29e7dc9bda1b4c38c53229d8b5442d..5ea7490f02931c01216c2ed2a33ff127dcded5a6 100644
--- a/frameworks/ans/core/BUILD.gn
+++ b/frameworks/ans/core/BUILD.gn
@@ -82,9 +82,9 @@ ohos_shared_library("ans_core") {
   deps = [
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//base/miscservices/time/services:time_service",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
diff --git a/frameworks/ans/native/test/unittest/BUILD.gn b/frameworks/ans/native/test/unittest/BUILD.gn
index 734390a46a608466d285d40ee1027c12b4f10b90..83aab82323e8a410f64a22c5271afa89595ca908 100644
--- a/frameworks/ans/native/test/unittest/BUILD.gn
+++ b/frameworks/ans/native/test/unittest/BUILD.gn
@@ -58,7 +58,8 @@ ohos_unittest("ans_reminder_unit_test") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn
index ed922f4a379c8c41736b486cbcba7c756a01681d..89bfc5e711897d9d71508c6eacf68a479c422ec3 100644
--- a/frameworks/ans/test/moduletest/BUILD.gn
+++ b/frameworks/ans/test/moduletest/BUILD.gn
@@ -105,7 +105,8 @@ ohos_moduletest("ans_fw_module_test") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
@@ -187,7 +188,8 @@ ohos_moduletest("ans_innerkits_module_publish_test") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
@@ -265,7 +267,8 @@ ohos_moduletest("ans_innerkits_module_slot_test") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
@@ -343,7 +346,8 @@ ohos_moduletest("ans_innerkits_module_setting_test") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
diff --git a/frameworks/wantagent/BUILD.gn b/frameworks/wantagent/BUILD.gn
index 7121bed127f73ff2f63ab8041d4480ba30cbe193..f347a956221560e19e236136bf34326e01eb2dbc 100644
--- a/frameworks/wantagent/BUILD.gn
+++ b/frameworks/wantagent/BUILD.gn
@@ -29,10 +29,10 @@ config("wantagent_innerkits_public_config") {
     "//foundation/aafwk/standard/interfaces/innerkits/want/include",
     "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
     "//foundation/aafwk/standard/services/abilitymgr/include",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/appmgr",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
-    "//foundation/appexecfwk/standard/kits/appkit/native/app/include",
+    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include",
     "//third_party/icu/icu4c/source/common",
   ]
 }
@@ -60,12 +60,13 @@ ohos_shared_library("wantagent_innerkits") {
 
   deps = [
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//utils/native/base:utils",
   ]
diff --git a/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn b/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
index 45b7c58e89e625c0ec04ed2cf13bcf5c2f24a731..ae52cef7e5bf5c4fdba759d4efb0824357a90af0 100644
--- a/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
@@ -38,14 +38,15 @@ ohos_unittest("completed_dispatcher_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
diff --git a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn
index 46d9f1e375e168767c51d2729ff6348a41ec3853..89577edfda4298856c98468aaa469179220a8c64 100644
--- a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn
@@ -42,14 +42,15 @@ ohos_unittest("pending_want_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
diff --git a/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn b/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn
index 13fcb04025e4b7229c66c955025807fe9e778bbb..27fb0a395e55859c6497b2555fd2fcda60d85e0c 100644
--- a/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn
@@ -38,14 +38,15 @@ ohos_unittest("trigger_Info_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
index 02dd1270e82f3ff787cc84ed2edbef82088a6b59..5b39916370eaab516f609ed4404542c1bb73b220 100644
--- a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
@@ -38,14 +38,15 @@ ohos_unittest("want_agent_helper_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
diff --git a/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn
index 6175002f2ef60e5b0cbf37ec2138f2c7eea41c01..241ca1d9b95ee76c10b68a68c3108942336b1aac 100644
--- a/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn
@@ -38,14 +38,15 @@ ohos_unittest("want_agent_info_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
diff --git a/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn
index 4a0ccaebd1d38e6dba64b7355950e0f8a248bce6..1ce175a94e2317673e394b0407904f16c78f3ea6 100644
--- a/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn
@@ -38,14 +38,15 @@ ohos_unittest("want_agent_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
diff --git a/interfaces/kits/napi/wantagent/BUILD.gn b/interfaces/kits/napi/wantagent/BUILD.gn
index 8e9f83c18b137d5131cf8cbedeca5e3007a70d78..212662802c18f53e2dcb1f759041f8ef21513f88 100644
--- a/interfaces/kits/napi/wantagent/BUILD.gn
+++ b/interfaces/kits/napi/wantagent/BUILD.gn
@@ -40,17 +40,18 @@ ohos_shared_library("wantagent") {
   deps = [
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
     "//foundation/ace/napi:ace_napi",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//utils/native/base:utils",
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
diff --git a/notification.gni b/notification.gni
index 3039d020827e631a2fed299cc2c5ce895915e019..d8552e9fd2b451a52e7e69f0dce9e298dd692e74 100644
--- a/notification.gni
+++ b/notification.gni
@@ -30,8 +30,8 @@ tools_path = "${ans_standard_path}/tools"
 aafwk_path = "//foundation/aafwk/standard"
 
 ans_standard_external_deps = [
-  "aafwk_standard:base",
-  "aafwk_standard:want",
+  "ability_runtime:base",
+  "ability_runtime:want",
   "appexecfwk_standard:appexecfwk_base",
   "appexecfwk_standard:appexecfwk_core",
   "appexecfwk_standard:libeventhandler",
diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn
index d29b10ee98212b72f64be5c305b387912281fa2c..14a13e740fb03967d3effe557e214a8d5b47aad7 100644
--- a/services/ans/test/unittest/BUILD.gn
+++ b/services/ans/test/unittest/BUILD.gn
@@ -92,7 +92,8 @@ ohos_unittest("ans_unit_test") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn
index 217cb3f368201d7c2c0ba90ebfde5f365a6f55dc..c534aecd8ded51c211a210502d33da83b6679714 100644
--- a/services/test/moduletest/BUILD.gn
+++ b/services/test/moduletest/BUILD.gn
@@ -90,7 +90,8 @@ ohos_moduletest("ans_module_test") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn
index 5ee78f9a7428d0fc9d86f84414d922a168d6af12..8b1153d246f868dc701987142505e74ad1155a16 100644
--- a/test/common/acts/actsnotificationfuzztest/BUILD.gn
+++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn
@@ -40,7 +40,7 @@ ohos_systemtest("ActsNotificationFuzzTest") {
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include",
-    "//foundation/appexecfwk/standard/kits/appkit/native/app/include",
+    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include",
     "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
     "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
@@ -49,10 +49,10 @@ ohos_systemtest("ActsNotificationFuzzTest") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
-    "//foundation/appexecfwk/standard/kits/appkit/native/app/include/task",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher/include/threading",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher/include/dispatcher",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher/include/task",
+    "//foundation/aafwk/standard/frameworks/kits/app/native/app/include/task",
+    "//foundation/aafwk/standard/common/task_dispatcher/include/threading",
+    "//foundation/aafwk/standard/common/task_dispatcher/include/dispatcher",
+    "//foundation/aafwk/standard/common/task_dispatcher/include/task",
   ]
 
   cflags = []
@@ -69,12 +69,12 @@ ohos_systemtest("ActsNotificationFuzzTest") {
     "//base/notification/ans_standard/services/ans:ans_targets",
     "//base/notification/ces_standard/frameworks/common:libevent_common",
     "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits",
+    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
     "//foundation/aafwk/standard/interfaces/innerkits/base:base",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
-    "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher:appkit_dispatcher_td",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
@@ -88,7 +88,8 @@ ohos_systemtest("ActsNotificationFuzzTest") {
     "LOG_DOMAIN = 0xD002200",
   ]
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "appexecfwk_standard:libeventhandler",
diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn
index 8dbed1163f3d0ed7e52a95760dc8286000cd33e3..cb4e795211a332b3b1ff266c242a53979a11ec19 100644
--- a/test/resource/ansSTSlotGroupTest/BUILD.gn
+++ b/test/resource/ansSTSlotGroupTest/BUILD.gn
@@ -26,7 +26,7 @@ config("ansSTSlotGroupTestConfig") {
 
   include_dirs = [
     "${SUBDEMOSYSTEM_DIR}/include",
-    "//foundation/appexecfwk/standard/kits/appkit/native/app",
+    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app",
     "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
@@ -53,14 +53,15 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") {
     "${frameworks_path}/ans/native:ans_innerkits",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/appexecfwk/standard/common:libappexecfwk_common",
-    "//foundation/appexecfwk/standard/kits:appkit_native",
     "//foundation/appexecfwk/standard/services/bundlemgr:libbms",
     "//utils/native/base:utilsbase",
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
     "hiviewdfx_hilog_native:libhilog",
diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn
index fd79d5caa61a6217ec4fd5ad84d5212a48314173..67130ba9690ad687ce575ff37ae4b4acc33d77c1 100644
--- a/test/systemtest/acts/ansDump/BUILD.gn
+++ b/test/systemtest/acts/ansDump/BUILD.gn
@@ -41,7 +41,8 @@ ohos_systemtest("AnsDumpTest") {
   ]
 
   external_deps = [
-    "aafwk_standard:want",
+    "ability_runtime:app_manager",
+    "ability_runtime:want",
     "appexecfwk_standard:appexecfwk_core",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",