diff --git a/ability/ability_runtime/aacommand/AACommand07/Test.json b/ability/ability_runtime/aacommand/AACommand07/Test.json
deleted file mode 100644
index c77e1f277237b3d2d2ae23da33480da6654a7c3e..0000000000000000000000000000000000000000
--- a/ability/ability_runtime/aacommand/AACommand07/Test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.aacommand07",
-        "module-name": "entry_test",
-        "shell-timeout": "600000"
-    }
-}
-
diff --git a/ability/ability_runtime/aacommand/AACommand08/Test.json b/ability/ability_runtime/aacommand/AACommand08/Test.json
deleted file mode 100644
index 5e59b5a676c9c4c15534cd8f4dcc2c3312bddcbb..0000000000000000000000000000000000000000
--- a/ability/ability_runtime/aacommand/AACommand08/Test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.aacommand08",
-        "module-name": "entry_test",
-        "shell-timeout": "600000"
-    }
-}
-
diff --git a/ability/ability_runtime/aacommand/AACommandPrintSync/Test.json b/ability/ability_runtime/aacommand/AACommandPrintSync/Test.json
deleted file mode 100644
index 5516acb35d25f0def2b68b989534390b54684623..0000000000000000000000000000000000000000
--- a/ability/ability_runtime/aacommand/AACommandPrintSync/Test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.aacommandprintsync",
-        "module-name": "entry_test_desc",
-        "shell-timeout": "600000"
-    }
-}
-
diff --git a/ability/ability_runtime/aacommand/AACommandRelyHap/Test.json b/ability/ability_runtime/aacommand/AACommandRelyHap/Test.json
deleted file mode 100644
index 0ce77b309fd9c92378b85910db1fa7b803deccb3..0000000000000000000000000000000000000000
--- a/ability/ability_runtime/aacommand/AACommandRelyHap/Test.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "description": "Configuration for aceceshi Tests"
-}
-
diff --git a/ability/ability_runtime/aacommand/AACommandpackage/Test.json b/ability/ability_runtime/aacommand/AACommandpackage/Test.json
deleted file mode 100644
index a785538543670e0f9574f15c33e0ab44926f06aa..0000000000000000000000000000000000000000
--- a/ability/ability_runtime/aacommand/AACommandpackage/Test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.actsaacommandtestatest",
-        "module-name": "entry_test",
-        "shell-timeout": "600000"
-    }
-}
-
diff --git a/ability/ability_runtime/faapicover/faauxiliary/BUILD.gn b/ability/ability_runtime/faapicover/faauxiliary/BUILD.gn
index 836d6b89efe9c3561ba0bdeee77ac507fac54b36..8c50cae76045bae4fff9318cc18aec953d57e8d9 100644
--- a/ability/ability_runtime/faapicover/faauxiliary/BUILD.gn
+++ b/ability/ability_runtime/faapicover/faauxiliary/BUILD.gn
@@ -13,19 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FaAuxiliary") {
+ohos_hap_assist_suite("FaAuxiliary") {
   hap_name = "FaAuxiliary"
   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 = [
     ":faauxiliary_resources",
     ":faauxiliary_ts_assets",
   ]
-  certificate_profile = "signature/openharmony_sx.p7b"
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("faauxiliary_ts_assets") {
diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn
index 0551673c6d9e6a8e0ae2143c06af51a971e58586..0e7a153771a8849e56ba6c0ed5c9c5532a26fc5c 100644
--- a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn
+++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn
@@ -12,19 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FinishWithResultEmptyTest") {
+ohos_hap_assist_suite("FinishWithResultEmptyTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "FinishWithResultEmptyTest"
-  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/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn
index ed6c72f0a26b6d1ad91adca0744f21b2205ce7f6..8c8e22c901f897f70e8d0d4cbda4b5049e5858e0 100644
--- a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn
+++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn
@@ -12,19 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FinishWithResultPromiseParametersTest") {
+ohos_hap_assist_suite("FinishWithResultPromiseParametersTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "FinishWithResultPromiseParametersTest"
-  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/featureability/sceneproject/finishwithresulttest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn
index 0dd27e7af1e10faa63dbf77c3d9469527f13122d..3444c3f4a532c0a53d9bf2e475225c4dac12924d 100644
--- a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn
+++ b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn
@@ -12,19 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FinishWithResultTest") {
+ohos_hap_assist_suite("FinishWithResultTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "FinishWithResultTest"
-  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/featureability/sceneproject/getcallingbundletest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn
index 72ef3714c8817ff544e3e5f126f24a96df945927..ab413e5eb0091c41140ce6242d978ccd0d6ba610 100644
--- a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn
+++ b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn
@@ -12,19 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("GetCallingBundlePromiseTest") {
+ohos_hap_assist_suite("GetCallingBundlePromiseTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "GetCallingBundlePromiseTest"
-  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/featureability/sceneproject/startability/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn
index 3b0684b8f4f14f0ccb01386261c68c71d48ed78a..ba8ecfa65e1faa84eaf45b34cb91112af3948774 100644
--- a/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn
+++ b/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn
@@ -12,19 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("StartAbility") {
+ohos_hap_assist_suite("StartAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "StartAbility"
-  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/featureability/sceneproject/startabilityforresult/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn
index e1e3ea836c882bac2f2a5780892ff0d260e3a567..9bfca6dd54e5ca3f44fec3586762f19fc5b6b352 100644
--- a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn
+++ b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn
@@ -12,19 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("StartAbilityForResult") {
+ohos_hap_assist_suite("StartAbilityForResult") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "StartAbilityForResult"
-  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/featureability/sceneproject/terminateabilitytest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn
index 3ddfb2615cc76de46b7035028e0124d1c6941866..1ed4d31a30598af0ee9d9e9939845744769d3c44 100644
--- a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn
+++ b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn
@@ -12,19 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("TerminateAbilityTest") {
+ohos_hap_assist_suite("TerminateAbilityTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "TerminateAbilityTest"
-  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"