diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn
index 391e1a9589f71111c16c6571c05bba8edb6e39a1..933072fb5506a47ac4b4a2e5e0c9f6b40f94be82 100644
--- a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn
@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackFifthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackFifthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn
index ecd15d7bfe59577f1157466035c4f1b6fddf5b8e..0de865777dc474ba3675381ee70b539810c1624b 100644
--- a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn
@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackFirstSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackFirstSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn
index 4c54032042ddfd4d8a81b05882189bc1ae2a16db..ed428847edcb21c8e9fb97e7771c9285ce972f89 100644
--- a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn
@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackFourthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackFourthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn
index fc0823c5619580660a3ed835154df699626717f6..0003853470e3d875d6cd3df5026f2d0ae40dd44e 100644
--- a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn
@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackSecondSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackSecondSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn
index 79b9a0d70ef1d8aea1f1a58e108c6e14162ec208..572658dd53dc68c7294664902a6e3d738d5fb569 100644
--- a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn
@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackThirdSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackThirdSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn
index bb404efea206deb6f513417185d7996ee5a8bec0..2996f44091c2d5fcc141a3e3af8ce5b4496cfffa 100644
--- a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn
@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestFifthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestFifthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn
index 140c37d5391389e848e355fb82a612732e16e9c8..89362b18a424f4cb302f01449500c4d892bf0831 100644
--- a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn
@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestFirstSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestFirstSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn
index bb9ffa777ab41df5da40df35a5aaa52a801e2a27..1d0c9b8ed703add7d79794dda91f341fc13d8d3c 100644
--- a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn
@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsTestFourthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestFourthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn
index c4e09388f63b092a0a47fd24ee89753197bf85a2..c07ac1c76c1613eb868a89af51dd1d993aa0cf95 100644
--- a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn
@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestSecondSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestSecondSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn
index f982b0ac260b142c9b5eafec949ae83a0306eed8..c67405bd2e87af18ff25f342673edf85ebbed266 100644
--- a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn
@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestThirdSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestThirdSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn
index c136206820f2713a3208eb9402cce9f6b75ebd8e..b9ec76482b8a19f08a7fd9f1c36791bba3f3fe77 100644
--- a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn
@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("simulateEAbility") {
+ohos_hap_assist_suite("simulateEAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "simulateEAbility"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn
index aa893e79e2e4057eb507ee3fb1797733731c2ab9..a4c4d896510d0857fe38bdef5d95fd05196fbc91 100644
--- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn
@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("simulateFAbilityFir") {
+ohos_hap_assist_suite("simulateFAbilityFir") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "simulateFAbilityFir"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn
index c1b531b833dd21827785712d6f9cce985d221f4a..bccf4c2b427139e75551544fbc8d10f6eb95fce9 100644
--- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn
@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("simulateFAbilitySed") {
+ohos_hap_assist_suite("simulateFAbilitySed") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "simulateFAbilitySed"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn
index 04ca71663f093aba5ae56ec21ee9dc68da9ec5fc..fb37afd00b4671a11ce63f1564af3f72f5c9e383 100644
--- a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn
@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("verifyAAbility") {
+ohos_hap_assist_suite("verifyAAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "verifyAAbility"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn
index 64cc8690a79c919b97649925b122919c541f0bab..8853b8db6e4202fa35d1939bb5f46e0931b9a451 100644
--- a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn
+++ b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn
@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("verifyIAbility") {
+ohos_hap_assist_suite("verifyIAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "verifyIAbility"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn
index e4d097d5d25108f2245ad2ef70d61414b6f79cf5..13776d913c835dff55d63d7dc1c1bb6a493e37f1 100644
--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapARelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapa_app_profile") {
diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn
index 40968164b51877e9e18745b44dae87f9cae6c0c7..eaeb75569e4fc8fbb1a61e78810ad24b1ae9acf5 100644
--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapBRelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapBRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapb_app_profile") {
diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn
index d2270882e71031b214324798f06c56ef91933f66..ad48f9ef4862f82f5713d8f2729444c536a9aa4f 100644
--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapCRelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapCRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapCRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapCRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapc_app_profile") {
diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn
index f1b8454b303b2a9ac8ac602c203752d11ba0b6e4..8ba377100fe6aed99b4028d11d94da88949784f1 100644
--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapDRelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapDRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapDRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapDRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapd_app_profile") {
diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn
index 410d6e41471fd37801a510e9600f23cb602037b9..ddd96cde02cee73afc6e70259cf5d9131379f1e2 100644
--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn
@@ -12,19 +12,19 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapERelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapERelyHap") {
   hap_name = "ActsAmsAbilityMultiinstanceHapERelyHap"
   js_build_mode = "debug"
   hap_profile = "./src/main/config.json"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn
index 4c7ade0dc5bfbe244641e2ac2fa776f8fe8d7209..6297b221f5a3685690cece5f26f4ad9a1d8637bd 100644
--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsAbilityMultiinstanceTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstance_app_profile") {
diff --git a/ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn b/ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn
index 1d7f643cc2fcfc07cd59c1ca8e81363c0cfa2f6b..3cd0bf7c08841696d4437a2028752e00c14cb347 100644
--- a/ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn
+++ b/ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAbilityDelegatorCaseTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAbilityDelegatorCaseTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"
diff --git a/ability/ability_runtime/actsabilitymanageretstest/BUILD.gn b/ability/ability_runtime/actsabilitymanageretstest/BUILD.gn
index f46a00c09886d8c5863852d49f43b58ea86cbbd4..f66e0f9feed2b7dd0d1b5eca05c8d514defd3b99 100644
--- a/ability/ability_runtime/actsabilitymanageretstest/BUILD.gn
+++ b/ability/ability_runtime/actsabilitymanageretstest/BUILD.gn
@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAbilityManagerEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAbilityManagerEtsTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
diff --git a/ability/ability_runtime/actsabilityusertest/BUILD.gn b/ability/ability_runtime/actsabilityusertest/BUILD.gn
index ceb477ada1b28a8c1d798d36a2d0c0d4d7f659bc..41a6978b12a711cbfa740b9a841ca589d106d421 100644
--- a/ability/ability_runtime/actsabilityusertest/BUILD.gn
+++ b/ability/ability_runtime/actsabilityusertest/BUILD.gn
@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAbilityuserTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAbilityuserTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsabilityusertest_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn
index fa08674129ae0bf7bc574f752b954117db407f1f..a74e73e61320aa7d5438dcd74a67dbc0b5804978 100644
--- a/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCalleeARelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCalleeARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,9 @@ ohos_hap("ActsSystemAppCalleeARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCalleeARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcalleea_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn
index 8922634becabb0906fb18d3bcedb61e210706866..0be14cb3c113886d9687e84a74ebd8c804e8ba8b 100644
--- a/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCallerARelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCallerARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsSystemAppCallerARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCallerARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcallera_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn
index dec1d5baa6ab0073daabee01616f3709cbd58d97..8ca9af12d17218534b4ce619370079841aeb4fbe 100644
--- a/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCallerBRelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCallerBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsSystemAppCallerBRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCallerBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcallerb_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn
index 91dea07daf9362bb9d5e5c9e5db7595ee5c51e4f..c94ccaf1a46eef2c5a091142a98302f709b55787 100644
--- a/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCallerCRelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCallerCRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsSystemAppCallerCRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCallerCRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcallerc_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn b/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn
index 1e81ee4a091883bfca4db90e55da699051a0e659..0aec8d0cd464e0763663b3f60950c034cbab7b79 100644
--- a/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsCallTestEntryTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsCallTestEntryTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemcallentrytest_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn b/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn
index 4bb56ffa760a1be6eb621e62f87f448fae7509a4..04c9c9635d687174e425eef335b511376d2c2093 100644
--- a/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsCallTestFeatureRelyHap") {
+ohos_hap_assist_suite("ActsCallTestFeatureRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsCallTestFeatureRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsCallTestFeatureRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemcallfeature_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn b/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn
index a32cbe786caf9bd31db664df38661b2774632764..bd3c4ec7cda426958793e3ea079c37f7184f099f 100644
--- a/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsThirdAppARelyHap") {
+ohos_hap_assist_suite("ActsThirdAppARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsThirdAppARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsThirdAppARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("thirdappa_app_profile") {
diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn b/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn
index 217620fcef1a36dcba57c0541a92f40a1f5ab0dc..018fcd69650361240fef9f9b236ac0c4feab91eb 100644
--- a/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn
+++ b/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsThirdCallTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsThirdCallTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("thirdcalltest_app_profile") {
diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn
index e6c31b21c318005c0a5981f7068f6fb50a5369a2..5b7f071733d504cf858060b737d8d93593868699 100644
--- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn
@@ -13,19 +13,19 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersApi7AppA") {
+ohos_hap_assist_suite("ActsAmsUsersApi7AppA") {
   hap_name = "ActsAmsUsersApi7AppA"
   js_build_mode = "debug"
   hap_profile = "entry/src/main/config.json"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsusersapi7appa_resources",
     ":actsamsusersapi7appa_ts_assets",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("actsamsusersapi7appa_ts_assets") {
diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn
index e98b3f4c8d186585f10eee36257e3260d0d64c44..57fc9150e8512745e355cabc81a86544ba42cdff 100644
--- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersKillProcessAppA") {
+ohos_hap_assist_suite("ActsAmsUsersKillProcessAppA") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsUsersKillProcessAppA"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsuserskillprocessappa_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsUsersKillProcessAppA") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserskillprocessappa_app_profile") {
diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn
index 36056d57a323abf8d3b571c8ca45ed5b88c2c4b5..1fe9fb65d3577126c18b3905843cc12a72381a55 100644
--- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersKillProcessAppB") {
+ohos_hap_assist_suite("ActsAmsUsersKillProcessAppB") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsUsersKillProcessAppB"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsuserskillprocessappb_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsUsersKillProcessAppB") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserskillprocessappb_app_profile") {
diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn
index 125e54b0ed991b8cd0f09f1a1d80119de3235b43..5ff166f444f6684f75ae5b26d2a0b67a99f3839b 100644
--- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersKillProcessAppC") {
+ohos_hap_assist_suite("ActsAmsUsersKillProcessAppC") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsUsersKillProcessAppC"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsuserskillprocessappc_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsUsersKillProcessAppC") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserskillprocessappc_app_profile") {
diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn
index 75f1260327f0005bd99a0e60d49c87263b0dbfd7..b4ebea688778e6a33a0283f03dcecf22452b1b71 100644
--- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsUsersSystemTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsUsersSystemTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserssystemtest_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn
index 01923c8abee711bf12c27f14d3f155d741afe10e..7c3ad3912b9a29741a3f907c9a5daf6982e9a3e5 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsExtensionModuleRelyHap") {
+ohos_hap_assist_suite("ActsAmsExtensionModuleRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsExtensionModuleRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsextensionmodulerelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsExtensionModuleRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsextensionmodulerelyhap_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn
index d5411ce92f2f38e1d886c5fc2c20f0e7f7b945ef..3fd2ddbd166aeadc351b6e83c5391ac6b857d71e 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticAbilityStageContextTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticAbilityStageContextTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticabilitystagecontexttest_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn
index be5fe116bdd431b29de1f9933b8262835c4f609f..3aff924a9d6339fc8c857dcd506fe0b215d95436 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticExtensionInfoRelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticExtensionInfoRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticExtensionInfoRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticextensioninforelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticExtensionInfoRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticextensioninforelyhap_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn
index 53c8c54a11b4ef517d87a84e7e33e903bee7ef67..b395e853b7be3a32b9e251924d58be96cf6f9cc3 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticExtensionInfoTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticExtensionInfoTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticextensiontnfotest_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn
index c025b8f101a154f3c2d376a217353d4a479c8cdc..10f4699f2ed93b13883093df66736a2d9a737f51 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticARelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticarelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticARelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticarelyhap_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn
index ab6b535b9c70e70d605806a08a90e7ad3d5cc475..49af930e2d29d513f142438388f3ce37179323ee 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticBRelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticbrelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticBRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticbrelyhap_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn
index 12b3a2e022c2a0e88993a1bbeedbe2a7df3ef86e..2c389d1a515c524d1d9d8a02cb7ddf7a097f5f3d 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticInfoMationQueryTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticInfoMationQueryTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticinfomationquerytest_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn
index 6bc4c54df9c204fc11c3fe14ac3f1b5ff2ad1ebe..73a7bee1a5da3d5bc6ca5a1c9f347f0039e08098 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticInformationMultipleTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticInformationMultipleTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticinformationmultipletest_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn
index 246c0ccc9bd7a569670c5c9ebca9cad4d680308f..15e2ad8142b1e5cab25cc9981ca21fec40791434 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticInformationMultiTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticInformationMultiTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticinformationmultitest_app_profile") {
diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn
index 5a1dd9bb4ff51cf21b9504b5c7e3f82b789ed3ed..e0e1a2076514a263ec027e40673b4b0383d26a57 100644
--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticQueryTestTwoRelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticQueryTestTwoRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticQueryTestTwoRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticquerytesttworelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticQueryTestTwoRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticquerytesttworelyhap_app_profile") {
diff --git a/ability/ability_runtime/amsdatauriutils/BUILD.gn b/ability/ability_runtime/amsdatauriutils/BUILD.gn
index 334a3426e61dc0b05b9af923ee15657de37d9e24..e5e4332eded15b417998331d23e94db49d666125 100644
--- a/ability/ability_runtime/amsdatauriutils/BUILD.gn
+++ b/ability/ability_runtime/amsdatauriutils/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAmsDataUriUtilsTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsDataUriUtilsTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn
index d0cdaa3d39f944f50516d6dfb2285999737483a2..23eabad08ebe92afb21828f40f45e113aa08d332 100644
--- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn
+++ b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsSpecifyTestRelyHap") {
+ohos_hap_assist_suite("ActsAmsSpecifyTestRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,11 @@ ohos_hap("ActsAmsSpecifyTestRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsSpecifyTestRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsspecifytestrelyhap_app_profile") {
diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn
index c73cf5a8630c41d49d97f95e6b73cf01f562f36a..d1d32c9d018af5275b9fcac26f04a1ac41086d76 100644
--- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn
+++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn
@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAmsStartAbilityTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStartAbilityTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstartabilitytest_app_profile") {
diff --git a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn
index 94076317fe4d49a58d53395ef86ffc3ea98c9dc8..ed78cabf6ea490b5dd198aeece0623e03a947cc0 100644
--- a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn
+++ b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAbilityRunningInfosTest") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn b/ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn
index 64212951a9b672d08eaf575e9a143b9fa9df92a8..4182a20dd2bdf2b67e3c30d427b814783f90f8dc 100644
--- a/ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn
+++ b/ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsApiCoverhapTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsApiCoverhapTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("apicoverhaptest_app_profile") {
diff --git a/ability/ability_runtime/apicover/fasupplement/BUILD.gn b/ability/ability_runtime/apicover/fasupplement/BUILD.gn
index 33bebd081a1de9de8651a23909a7adc905fd780c..1b584cb785ae0d691ed8bf6f61c77bb5ae371bea 100644
--- a/ability/ability_runtime/apicover/fasupplement/BUILD.gn
+++ b/ability/ability_runtime/apicover/fasupplement/BUILD.gn
@@ -13,18 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FaSupplement") {
+ohos_hap_assist_suite("FaSupplement") {
   hap_profile = "entry/src/main/config.json"
   hap_name = "FaSupplement"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":fasupplement_resources",
     ":fasupplement_ts_assets",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("fasupplement_ts_assets") {
diff --git a/ability/ability_runtime/apicover/formmodule/BUILD.gn b/ability/ability_runtime/apicover/formmodule/BUILD.gn
index 9a4fb6c9a2ac68d5a8aa8235b39d17aea4eb1cd6..13d845198f807e9ddace7960664ce2fea9e7d70b 100644
--- a/ability/ability_runtime/apicover/formmodule/BUILD.gn
+++ b/ability/ability_runtime/apicover/formmodule/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormModule") {
+ohos_hap_assist_suite("FormModule") {
   hap_name = "FormModule"
   js_build_mode = "debug"
   hap_profile = "entry/src/main/module.json"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":formmodule_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("FormModule") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("formmodule_app_profile") {
diff --git a/ability/ability_runtime/apicover/stagesupplement/BUILD.gn b/ability/ability_runtime/apicover/stagesupplement/BUILD.gn
index b41e4606414164a02d825f52c884944cf120732e..257ee0f129f124094b016919533b2d4037dbd5d8 100644
--- a/ability/ability_runtime/apicover/stagesupplement/BUILD.gn
+++ b/ability/ability_runtime/apicover/stagesupplement/BUILD.gn
@@ -13,12 +13,10 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("StageSupplement") {
+ohos_hap_assist_suite("StageSupplement") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "StageSupplement"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":stagesupplement_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("StageSupplement") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("stagesupplement_app_profile") {
diff --git a/ability/ability_runtime/context/actscontexttest/BUILD.gn b/ability/ability_runtime/context/actscontexttest/BUILD.gn
index 1c7a8a8462eba2fca0aca3a09edc0386ff1a9e9b..bc20877b258d188317605657eb2bcaf015fdb560 100644
--- a/ability/ability_runtime/context/actscontexttest/BUILD.gn
+++ b/ability/ability_runtime/context/actscontexttest/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsContextTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsContextTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/context/scene/defpermission/BUILD.gn b/ability/ability_runtime/context/scene/defpermission/BUILD.gn
index 90f79580967e217cd19f0ec42fcf0eafd8aa4e48..f613d81afa1a0f0ef392741986403d54d4ae1e1b 100644
--- a/ability/ability_runtime/context/scene/defpermission/BUILD.gn
+++ b/ability/ability_runtime/context/scene/defpermission/BUILD.gn
@@ -12,19 +12,19 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("DefPermission") {
+ohos_hap_assist_suite("DefPermission") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "DefPermission"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/ability/ability_runtime/fa/faapplicationinfo/BUILD.gn b/ability/ability_runtime/fa/faapplicationinfo/BUILD.gn
index a7c8309ab39586a79f46d0cd990dab8c66b579c5..739455fe5b35678a3438eb5282d56c1b44c04010 100644
--- a/ability/ability_runtime/fa/faapplicationinfo/BUILD.gn
+++ b/ability/ability_runtime/fa/faapplicationinfo/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsApplicationinfoTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsApplicationinfoTest"
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn b/ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn
index 3e398efca17cebc3a70f780a9297aa67c2f6654a..bc41908a05078a7cd46c4cfd78b1cb252b1c5b99 100644
--- a/ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn
+++ b/ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsConfigurationconstantTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsConfiGurationConstantTest"
+  subsystem_name = "ability"
+  part_name = "ability_base"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/fa/facoverapi/BUILD.gn b/ability/ability_runtime/fa/facoverapi/BUILD.gn
index 07d70fae804ea3df4f9806d7067cc281bd9b5608..14be9fb81f15f0f222ef5fe36f0de87db7901335 100644
--- a/ability/ability_runtime/fa/facoverapi/BUILD.gn
+++ b/ability/ability_runtime/fa/facoverapi/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsCoverapiTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsCoverApiTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn b/ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn
index 3b5ef3cfa590a9c3c53b534272f94a1eecca5c07..bbbb3349132ef2f4ec96f07cab45fd5909532548 100644
--- a/ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn
+++ b/ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsEqueryabilitybywantTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsEqueryabilitybywantTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true
diff --git a/ability/ability_runtime/formmanager/BUILD.gn b/ability/ability_runtime/formmanager/BUILD.gn
index b2a8053495c26451200260c3d66c230e63af1d6f..9a28f457fd0037db853b9ac1a6242aa3b23441a8 100644
--- a/ability/ability_runtime/formmanager/BUILD.gn
+++ b/ability/ability_runtime/formmanager/BUILD.gn
@@ -18,7 +18,7 @@ group("formmanager") {
   if (is_standard_system) {
     deps = [
       "fa:formmanager",
-      #"stage:stage",
+      "stage:stage",
     ]
   }
 }
diff --git a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn
index b978d150f64f2d7e8447a0416eb4164607380ddc..8fd2d5d4fb1bce2754a520e7ccf34680ef6e32ed 100644
--- a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn
+++ b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn
@@ -13,19 +13,20 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantApi7RelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantApi7RelyHap") {
   hap_profile = "./entry/src/main/config.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantApi7RelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"
diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn
index 99f2ffec2fe195a35c26193fdca925f064907314..fe7342ad383088a4e2467eb44dffc3d53a5ab04c 100644
--- a/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn
+++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantARelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsnewwantarelyhap_js_assets",
@@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantARelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwantarelyhap_app_profile") {
diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn
index 441e65252fbdc1c1a228124b0bc20919b573355e..57c40f13f61756dbba59b69c356dc9b060fb9879 100644
--- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn
+++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantBRelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsnewwantbrelyhap_js_assets",
@@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantBRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwantbrelyhap_app_profile") {
diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn
index 9ea781fe1b3e3381716d70cac5b9e053a3b0311e..1790d486888a1a9a812d3da10e17b3f77e3acda9 100644
--- a/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn
+++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantRelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsnewwantrelyhap_js_assets",
@@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwantrelyhap_app_profile") {
diff --git a/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn b/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn
index a90e34bd620f0d824b28d07ad850743da0cf8b74..17b7abee12653a10c7b25ca7a11940685b64aa63 100644
--- a/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn
+++ b/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn
@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAmsNewWantTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsNewWantTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwanttest_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn
index ef397f88cccc0ff5638d059c4e97bf2af9b45f47..ab065348d4bbbdfdacbcc361136aaa345b730178 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapAARelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapAARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapAARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapAARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapaarelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn
index 12e1e9c3d2185d39075987d25ca35c9ea482c955..488c417543837b5a42d26f7078acca0597c923f0 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapABRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapABRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapABRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapABRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapabrelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn
index d5a07a60fdb65cf59b1c0d2fcea974a2c6d5dcd3..175cfe88607cf9362dc4983259ef22c41b3dc4ce 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBARelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbarelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn
index d2de656f5fab54c2295f5531a90f7eebf3755daf..5ce180bd150c87ec578113b5399de82f235a54b6 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBBRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBBRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbbrelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn
index 02ab49f475adbfcaf126ba5292628a0c038b4c54..f430a3f4da1a6dff969b80804c68b90740cb7e1f 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBCRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBCRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBCRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBCRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbcrelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn
index ecb1b25b0e6a2253fa22ce19008a203086136a9e..5f396f696d3f683e1be3ae986c94b2f75c3ac5a2 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBDRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBDRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBDRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBDRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbdrelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn
index d946023576bc361f057001ea14a2e2a01ceea86e..388ba1a1d9668d7d68a59e059993ae3b034d1a4d 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBERelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBERelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBERelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBERelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapberelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn
index 5be228dd262f53acc0d59deaadb4739b4dabaef3..a36cb3c53613ebda206c04073c5d0cc057adddd9 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBFRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBFRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBFRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBFRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbfrelyhap_app_profile") {
diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn
index 0c85331592d4630557313284dd237a5eb20570e9..c0560771ceebf1ba0c76c047c4991833b76ce4e3 100644
--- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn
+++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstance_app_profile") {