diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json
index eef1a2e055ebd37a95d39edbe6ab45e2f003e3df..975f5d63962e296b82b0266e33667a8fccce57e5 100644
--- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json
+++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json
@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "1700000",
         "package": "com.example.actsbundlemanagertest",
         "shell-timeout": "60000"
     },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn
index 4585808ecf45cfec0cd3b7c4ed56eb5779bcb505..34bf547d0533052824b6d6c37c5e31ec29ec5ab1 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest8") {
+ohos_hap("bmsJstest8") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest8"
+  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"
-  hap_name = "bmsJstest8"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
index 85897982efd018b8d88f733886af34c3bf7c9935..1d15907b3d19f77496a8b9e7023cc26bbc4f4d06 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest5") {
+ohos_hap("bmsJstest5") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest5"
+  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"
-  hap_name = "bmsJstest5"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
index e6887d9492a251a2219020a62b02742892fb001e..88abc78ce07bf34ded745631c3bae60bef1ee489 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest4") {
+ohos_hap("bmsJstest4") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest4"
+  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"
-  hap_name = "bmsJstest4"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn
index 55a16f5836e14162913d46786eb414b0b003637c..319b807ca673b74e60cc00de60300511f5bcf102 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest9") {
+ohos_hap("bmsJstest9") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest9"
+  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"
-  hap_name = "bmsJstest9"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
index 819fef56c57fa95e9d180752eaebf735ae77d72b..6c284b5bb9492575cc7cccae0b228e0411b7ea7d 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest1") {
+ohos_hap("bmsJstest1") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest1"
+  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"
-  hap_name = "bmsJstest1"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn
index 96a8b68dd98c7adbdf765de8323f4f478e6d1008..a3db2aafbe3e5815b56c7e7d1974ba3ff5b5627b 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest7") {
+ohos_hap("bmsJstest7") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest7"
+  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"
-  hap_name = "bmsJstest7"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
index 28cd23361f43d0b487035c307dc1d3e66892a5be..a70b6076746eb42ab4fe8ed26ed3e5ae24e90960 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest6") {
+ohos_hap("bmsJstest6") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest6"
+  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"
-  hap_name = "bmsJstest6"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
index 294dfb4b7f3897cf4af6f56db3723c9040e8459a..718885c670600cd7f3e0d567a8b192c9545fe403 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest3") {
+ohos_hap("bmsJstest3") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest3"
+  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"
-  hap_name = "bmsJstest3"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
index bb475d2258793e4fcd7cce9adce2aaeeb4457bf3..7e62c0e27d3051811d3f118064f11d531a386b5c 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest2") {
+ohos_hap("bmsJstest2") {
   hap_profile = "./src/main/config.json"
+  hap_name = "bmsJstest2"
+  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"
-  hap_name = "bmsJstest2"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"