diff --git a/jjb/verify/exampleservice.yaml b/jjb/verify/exampleservice.yaml
index fae36e3..e9b1e63 100644
--- a/jjb/verify/exampleservice.yaml
+++ b/jjb/verify/exampleservice.yaml
@@ -27,12 +27,14 @@
 - job-group:
     name: 'verify-exampleservice-jobs-modern'
     jobs:
-      - 'helm-api-test':
+      - 'api-test':
           dependency-jobs: 'verify_exampleservice_sonarqube'
+          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'verify-exampleservice-jobs-legacy'
     jobs:
       - 'api-test':
+          name-extension: '-legacy'
           dependency-jobs: 'verify_exampleservice_sonarqube'
           pipeline_script: 'all-xos-api-test.groovy'
diff --git a/jjb/verify/helm-charts.yaml b/jjb/verify/helm-charts.yaml
index 90930a8..bcdcfb4 100644
--- a/jjb/verify/helm-charts.yaml
+++ b/jjb/verify/helm-charts.yaml
@@ -13,10 +13,11 @@
     name: 'verify-helm-charts-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_helm-charts_licensed'
       - 'verify-helm-lint':
-          dependency-jobs: 'verify_helm-charts_sonarqube'
-      - 'helm-api-test':
+          dependency-jobs: 'verify_helm-charts_licensed'
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_helm-charts_helm-lint'
+      - 'api-test':
+          dependency-jobs: 'verify_helm-charts_sonarqube'
+          pipeline_script: 'chart-api-test-helm.groovy'
 
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 3bb889f..e25218d 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -17,10 +17,9 @@
           dependency-jobs: 'verify_xos_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_xos_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_xos_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
-      - 'helm-api-test':
-          dependency-jobs: 'verify_xos_sonarqube'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_xos_helm-api-test'
+          dependency-jobs: 'verify_xos_sonarqube'
+      - 'api-test':
+          dependency-jobs: 'verify_xos_unit-test'
+          pipeline_script: 'all-xos-api-test-helm.groovy'
+