diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn b/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn
index 021295f2963262de14ccaf331ff2b346f77adeda..27ecff427e7bc794ff770a9724f198765cb89acc 100644
--- a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn
+++ b/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn
@@ -10,17 +10,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsStServiceAilityServer") {
+ohos_hap("amsStServiceAilityServer") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "amsStServiceAilityServer"
+  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 = "amsStServiceAilityServer"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"
diff --git a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn
index 8c529148bb6aa77f74cf517e7e77cf33a234e55d..66dba9b9c7d1a6ba8d53f766c978f498dcba77c8 100644
--- a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn
+++ b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn
@@ -10,17 +10,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsLocalCanDisplayTest") {
+ohos_hap("ActsAnsLocalCanDisplayTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsLocalCanDisplayTest"
+  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 = "ActsAnsLocalCanDisplayTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"
diff --git a/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn b/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn
index 9f205f33395723b30d707a5c54c49d74080fb87c..ed28c5922930e1dbcd73689afea11af69203d35f 100644
--- a/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn
+++ b/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn
@@ -10,17 +10,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsPublishOneTest") {
+ohos_hap("ActsAnsPublishOneTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsPublishOneTest"
+  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 = "ActsAnsPublishOneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"
diff --git a/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn b/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn
index 3136d32fdbfd033a9efed67a68b70d61245122ea..f198bf413cda40508c77d6f56255e649f00885bb 100644
--- a/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn
+++ b/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn
@@ -10,17 +10,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsPublishTwoTest") {
+ohos_hap("ActsAnsPublishTwoTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsPublishTwoTest"
+  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 = "ActsAnsPublishTwoTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"
diff --git a/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn b/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn
index 35dfc3d9337327b0741e7cd9ee08508d74f1c261..66a1613d22418cfb4f244343fd6209362422f1c4 100644
--- a/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn
+++ b/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn
@@ -10,17 +10,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("test1") {
+ohos_hap("test1") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "test1"
+  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 = "test1"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"
diff --git a/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn b/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn
index dc23e8256c2a9746a5a88b8ffb55389e21c72e3d..2070fddace17d4ee86a7167c9f748771373b4f6a 100644
--- a/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn
+++ b/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn
@@ -10,17 +10,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("test2") {
+ohos_hap("test2") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "test2"
+  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 = "test2"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"