diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn
index 86c0015277121d11156236e1fdc9db30b485097a..6813fd7b44ff66f82ff4f4d298664668616d3709 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn
@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest5") {
+ohos_hap_assist_suite("bmsAccessTokenTest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest5"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn
index 000092124574c1954b3c6cfb47c7203606dc707e..444af82d4fc8e085dfd7cc89e6445a8311394460 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn
@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest4") {
+ohos_hap_assist_suite("bmsAccessTokenTest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest4"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn
index 70fbe4c35c2038dee743f11664a99d3cf72d909b..4cd14cbc0d4aab2e9d09b98bdc3374c8e4cf5b49 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn
@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest1") {
+ohos_hap_assist_suite("bmsAccessTokenTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest1"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn
index 4c4992f3bb057a95e27b0b2cc533d7bf2b0cb4a2..3c1170c6d5b51b097d76051b676f9178dffa6649 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest3") {
+ohos_hap_assist_suite("bmsAccessTokenTest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn
index 573fb8fec0481631e8a48d769b0cc5395d5f1afb..c967051211927d670e382d323e4a79d6586a3a33 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest2") {
+ohos_hap_assist_suite("bmsAccessTokenTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn
index fe1ad362fca9249bf503e567ea1091d03d0aa561..c5c42c3d5808fc964d0a4e355891b656c304564d 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("first_right") {
+ohos_hap_assist_suite("first_right") {
   hap_profile = "./src/main/config.json"
   hap_name = "first_right"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn
index fbf1f9ab2c992ffb1dd290722f7250368662b5e3..15e688f0f9e67561ff26cc34b7a3990442d7b671 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest5") {
+ohos_hap_assist_suite("bmsThirdBundleTest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest5"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn
index 6be28a62975355fcb8863412dd49ae1ecf6fa93d..2d87dd4797fbfeda9f9143067b90c947eaea234f 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest1") {
+ohos_hap_assist_suite("bmsThirdBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn
index a162a7a4fd8c7bad80a1277616e4bfd5b2814221..2412a52c62f09e1457d2d457393669f1319934c9 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTestA1") {
+ohos_hap_assist_suite("bmsThirdBundleTestA1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTestA1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn
index dd1898f074bbcf3d7e01a1e65aec59192278fca3..24da625dfd83bdfa96438e95598e6c0a78179d53 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest4") {
+ohos_hap_assist_suite("bmsThirdBundleTest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest4"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn
index 480b522a8af2c2deebbcbdaa6ae81e8e667b8075..69f2579270e4a9d284a6f5a3362b64c2a73ab3eb 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleC") {
+ohos_hap_assist_suite("bmsThirdBundleC") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleC"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn
index 822d2041f6623c6a1108e4c07798073059109652..4f1dc92c3594056ee301c75efa87351586cbb6d5 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleJs") {
+ohos_hap_assist_suite("bmsThirdBundleJs") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleJs"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn
index 88f38f7a911a26a91cbd71ee93015cb7c789693a..30940ae895bb1ddc063fb4abf5c6e5d119c159d7 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsSystemBundleTest1") {
+ohos_hap_assist_suite("bmsSystemBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsSystemBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn
index b77bb1112d6a07ed064fa10bd70c553a74d46f2f..0251cfdc320d7287c65327cee0162404b8ed6de6 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsSystemBundleTest2") {
+ohos_hap_assist_suite("bmsSystemBundleTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsSystemBundleTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn
index 87057b6841c87762fa8bf0926454673d480a4917..c858988bb5fafc8011e83ea7349b33611b8239ac 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsVendorBundleTest1") {
+ohos_hap_assist_suite("bmsVendorBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsVendorBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn
index 79c7d9cbfe42b74367cc84ab3de1a1b10fcb9a66..15fc2b28f7b1721e1414154a8a448aa687e4e67b 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest2") {
+ohos_hap_assist_suite("bmsThirdBundleTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn
index d6cfa6987892a5e11c00be5de0608593cfbf8f03..50ba08928d87f8fb815aff492fa94584d50dfda4 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest7") {
+ohos_hap_assist_suite("bmsThirdBundleTest7") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest7"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn
index 41e7d3f2bf358dc31a07c34f80aba9cf84405f23..2acc7f0748f5d0552d9b16cfa86ba6cf4473c5b3 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest6") {
+ohos_hap_assist_suite("bmsThirdBundleTest6") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest6"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn
index f6b4e879122985c1b07571e02c75c6ca827d66f6..402bdacca1794763b891ee13bc1417c95a9d59f9 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest3") {
+ohos_hap_assist_suite("bmsThirdBundleTest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn
index 4100f8cfa148eb16b375874fdfe9cc41c2d224e4..3806b01cc2343c28510f3bdbaa79f1745233eb7e 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsMainAbilityFirstScene") {
+ohos_hap_assist_suite("bmsMainAbilityFirstScene") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsMainAbilityFirstScene"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn
index 6d7b5976c36a103fb088a722b85fb8e27ea71224..ec38af8b003b4a0d768e36f9c69243c7c9a650af 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsMainAbilitySecondScene") {
+ohos_hap_assist_suite("bmsMainAbilitySecondScene") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsMainAbilitySecondScene"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn
index 83f293617b1c06534f2620a73fd095e1cd31fc95..ad74bec98e438cc98050632b2fbfdf5e1c0f28a3 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsModuleNameTest1") {
+ohos_hap_assist_suite("bmsModuleNameTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsModuleNameTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn
index 54e31892f39c1cb42ea0f5208072d39bdf8c9e0d..3ac75613ecc39e307e6a2edc2407b1255c553849 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsModuleNameTest2") {
+ohos_hap_assist_suite("bmsModuleNameTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsModuleNameTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
index a16ff01bbb239f17eb98ec315fcb727619006b7d..fbb79ca44ff6a088f493438f85effcb9db6ab44e 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest5") {
+ohos_hap_assist_suite("bmsJstest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest5"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
index f80086913f385ba2663390e22c6e40c3f6f57678..6e4f10d062fa18aa2fdef88d3f275b16e69cf274 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest4") {
+ohos_hap_assist_suite("bmsJstest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest4"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
index 66f5061f7a6265bbfd5493fa93e7f1b33b1f7c63..187ca2fdd93e178c483b7d0271fb1678a21a85c3 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest1") {
+ohos_hap_assist_suite("bmsJstest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
index d3c08b3de6f0cbf50156c5f58cea6434eda3671d..1f9e1d258ccebe1be546066eca2c6db4332e8902 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest6") {
+ohos_hap_assist_suite("bmsJstest6") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest6"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
index 2909d549912bfca244027841bbf8a998f9dee2ba..fb0492e51e9e3f16458d1b4f3fce9faab95aeedc 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest3") {
+ohos_hap_assist_suite("bmsJstest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
index dcb1048c5a5caddceee50c6326ca5632e278c64e..0a629ef172ac20ce773c3d2ba3da93ac94d329a2 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest2") {
+ohos_hap_assist_suite("bmsJstest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn
index 30411786f21d9371b86c39599383af290861c198..9c5146c949d176b4ac6174cf274e21ce8aaa64e9 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("second_right") {
+ohos_hap_assist_suite("second_right") {
   hap_profile = "./src/main/config.json"
   hap_name = "second_right"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn
index 5f43c61816b3627a104235881dad5bf0927a752d..3e617eee585e5de98693f83a7273e974ef6f3848 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsStageDemo1") {
+ohos_hap_assist_suite("bmsStageDemo1") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "bmsStageDemo1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn
index 627e0cd0c1057c1af0f0d98c357a6968c94413c0..c211090c20c25584beb3280621932f15d4d619fe 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsStageDemo2") {
+ohos_hap_assist_suite("bmsStageDemo2") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "bmsStageDemo2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",