diff --git a/jjb/verify/addressmanager.yaml b/jjb/verify/addressmanager.yaml
index 03a8f60..5ef30c7 100644
--- a/jjb/verify/addressmanager.yaml
+++ b/jjb/verify/addressmanager.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_addressmanager_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_addressmanager_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_addressmanager_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index 4a75876..8cc1ed6 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_att-workflow-driver_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_att-workflow-driver_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_att-workflow-driver_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-att-workflow-driver-jobs'
diff --git a/jjb/verify/cord-tester.yaml b/jjb/verify/cord-tester.yaml
index 65c1f8a..38db018 100644
--- a/jjb/verify/cord-tester.yaml
+++ b/jjb/verify/cord-tester.yaml
@@ -15,6 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_cord-tester_licensed'
-      - 'api-test':
-          dependency-jobs: 'verify_cord-tester_tag-collision'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/cord.yaml b/jjb/verify/cord.yaml
index 4738c0f..21ba362 100644
--- a/jjb/verify/cord.yaml
+++ b/jjb/verify/cord.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_cord_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_cord_ansible-lint'
-      - 'api-test':
-          dependency-jobs: 'verify_cord_sonarqube'
-          pipeline_script: 'all-xos-api-test.groovy'
diff --git a/jjb/verify/ecord.yaml b/jjb/verify/ecord.yaml
index 40177ca..fd0f78d 100644
--- a/jjb/verify/ecord.yaml
+++ b/jjb/verify/ecord.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_ecord_tag-collision'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_ecord_ansible-lint'
-      - 'api-test':
-          dependency-jobs: 'verify_ecord_sonarqube'
-          pipeline_script: 'all-xos-api-test.groovy'
diff --git a/jjb/verify/epc-service.yaml b/jjb/verify/epc-service.yaml
index a0f63f6..d1f2ff0 100644
--- a/jjb/verify/epc-service.yaml
+++ b/jjb/verify/epc-service.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_epc-service_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_epc-service_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_epc-service_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index fab4042..a515d26 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_fabric-crossconnect_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_fabric-crossconnect_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_fabric-crossconnect_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-fabric-crossconnect-jobs'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index 46a6ed0..70ccef0 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_fabric_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_fabric_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_fabric_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-fabric-jobs'
diff --git a/jjb/verify/hippie-oss.yaml b/jjb/verify/hippie-oss.yaml
index 5aeab09..a53233b 100644
--- a/jjb/verify/hippie-oss.yaml
+++ b/jjb/verify/hippie-oss.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_hippie-oss_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_hippie-oss_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_hippie-oss_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/hss_db.yaml b/jjb/verify/hss_db.yaml
index c40b69e..2a91e88 100644
--- a/jjb/verify/hss_db.yaml
+++ b/jjb/verify/hss_db.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_hss_db_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_hss_db_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_hss_db_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/internetemulator.yaml b/jjb/verify/internetemulator.yaml
index 4b84fe6..120fb40 100644
--- a/jjb/verify/internetemulator.yaml
+++ b/jjb/verify/internetemulator.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_internetemulator_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_internetemulator_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_internetemulator_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/k8sepcservice.yaml b/jjb/verify/k8sepcservice.yaml
index 755563c..fde0b75 100644
--- a/jjb/verify/k8sepcservice.yaml
+++ b/jjb/verify/k8sepcservice.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_k8sepcservice_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_k8sepcservice_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_k8sepcservice_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/kubernetes-service.yaml b/jjb/verify/kubernetes-service.yaml
index 7ee0e97..ba8555e 100644
--- a/jjb/verify/kubernetes-service.yaml
+++ b/jjb/verify/kubernetes-service.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_kubernetes-service_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_kubernetes-service_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_kubernetes-service_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-kubernetes-service-jobs'
diff --git a/jjb/verify/mcord.yaml b/jjb/verify/mcord.yaml
index 4f48b7c..36c47dc 100644
--- a/jjb/verify/mcord.yaml
+++ b/jjb/verify/mcord.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_mcord_ansible-lint'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_mcord_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_mcord_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index 3035803..c5bbbb3 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_olt-service_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_olt-service_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_olt-service_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-olt-service-jobs'
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index f61b384..558d7ed 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_onos-service_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_onos-service_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_onos-service_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-onos-service-jobs'
diff --git a/jjb/verify/openstack.yaml b/jjb/verify/openstack.yaml
index 5efce1b..5c963ad 100644
--- a/jjb/verify/openstack.yaml
+++ b/jjb/verify/openstack.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_openstack_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_openstack_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_openstack_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/platform-install.yaml b/jjb/verify/platform-install.yaml
index 544fe5f..7520d67 100644
--- a/jjb/verify/platform-install.yaml
+++ b/jjb/verify/platform-install.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_platform-install_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_platform-install_ansible-lint'
-      - 'api-test':
-          dependency-jobs: 'verify_platform-install_sonarqube'
-          pipeline_script: 'all-xos-api-test.groovy'
diff --git a/jjb/verify/progran.yaml b/jjb/verify/progran.yaml
index 8c1e687..30288d6 100644
--- a/jjb/verify/progran.yaml
+++ b/jjb/verify/progran.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_progran_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_progran_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_progran_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index b2d6484..f9b3994 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_rcord_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_rcord_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_rcord_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-rcord-jobs'
diff --git a/jjb/verify/sdn-controller.yaml b/jjb/verify/sdn-controller.yaml
index 4ba8516..110516a 100644
--- a/jjb/verify/sdn-controller.yaml
+++ b/jjb/verify/sdn-controller.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_sdn-controller_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_sdn-controller_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_sdn-controller_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/simpleexampleservice.yaml b/jjb/verify/simpleexampleservice.yaml
index 95ba4d3..6cda297 100644
--- a/jjb/verify/simpleexampleservice.yaml
+++ b/jjb/verify/simpleexampleservice.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_simpleexampleservice_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_simpleexampleservice_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_simpleexampleservice_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-simpleexampleservice-jobs'
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
index e913d62..7bce6b0 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -20,10 +20,6 @@
           dependency-jobs: 'verify_tt-workflow-driver_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_tt-workflow-driver_sonarqube'
-# Commenting this out until we're a bit farther along
-#      - 'api-test':
-#          dependency-jobs: 'verify_tt-workflow-driver_unit-test'
-#          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-tt-workflow-driver-jobs'
diff --git a/jjb/verify/vEE.yaml b/jjb/verify/vEE.yaml
index b14d607..d9571b2 100644
--- a/jjb/verify/vEE.yaml
+++ b/jjb/verify/vEE.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vEE_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vEE_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vEE_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vEG.yaml b/jjb/verify/vEG.yaml
index f1a269c..e10b23c 100644
--- a/jjb/verify/vEG.yaml
+++ b/jjb/verify/vEG.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_vEG_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vEG_sonarqube'
-#     - 'api-test':
-#         dependency-jobs: 'verify_vEG_unit-test'
-#         pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vEPC.yaml b/jjb/verify/vEPC.yaml
index 84ede17..31360ba 100644
--- a/jjb/verify/vEPC.yaml
+++ b/jjb/verify/vEPC.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vEPC_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vEPC_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vEPC_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vHSS.yaml b/jjb/verify/vHSS.yaml
index ee347d2..0224851 100644
--- a/jjb/verify/vHSS.yaml
+++ b/jjb/verify/vHSS.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vHSS_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vHSS_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vHSS_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vMME.yaml b/jjb/verify/vMME.yaml
index eb21c4e..9652d82 100644
--- a/jjb/verify/vMME.yaml
+++ b/jjb/verify/vMME.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vMME_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vMME_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vMME_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/venb.yaml b/jjb/verify/venb.yaml
index 63e2882..a9235bd 100644
--- a/jjb/verify/venb.yaml
+++ b/jjb/verify/venb.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_venb_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_venb_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_venb_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vnaas.yaml b/jjb/verify/vnaas.yaml
index 1516b90..34f44ba 100644
--- a/jjb/verify/vnaas.yaml
+++ b/jjb/verify/vnaas.yaml
@@ -19,7 +19,4 @@
           dependency-jobs: 'verify_vnaas_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vnaas_sonarqube'
-#      - 'api-test':
-#          dependency-jobs: 'verify_vnaas_unit-test'
-#          pipeline_script: 'all-xos-api-test-helm.groovy'
 #
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index 0217beb..68e3901 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -20,9 +20,6 @@
           dependency-jobs: 'verify_vrouter_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vrouter_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_vrouter_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 - job-group:
     name: 'publish-vrouter-jobs'
diff --git a/jjb/verify/vsg-hw.yaml b/jjb/verify/vsg-hw.yaml
index 872ce0b..88395f9 100644
--- a/jjb/verify/vsg-hw.yaml
+++ b/jjb/verify/vsg-hw.yaml
@@ -19,8 +19,5 @@
           dependency-jobs: 'verify_vsg-hw_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vsg-hw_sonarqube'
-      - 'api-test':
-          dependency-jobs: 'verify_vsg-hw_unit-test'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
 
 
diff --git a/jjb/verify/vsg.yaml b/jjb/verify/vsg.yaml
index da70ea6..73bcbc9 100644
--- a/jjb/verify/vsg.yaml
+++ b/jjb/verify/vsg.yaml
@@ -19,6 +19,3 @@
           dependency-jobs: 'verify_vsg_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vsg_sonarqube'
-#     - 'api-test':
-#         dependency-jobs: 'verify_vsg_unit-test'
-#         pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vspgwc.yaml b/jjb/verify/vspgwc.yaml
index 6e55246..f23154d 100644
--- a/jjb/verify/vspgwc.yaml
+++ b/jjb/verify/vspgwc.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vspgwc_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vspgwc_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vspgwc_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vspgwu.yaml b/jjb/verify/vspgwu.yaml
index 543b906..a53a854 100644
--- a/jjb/verify/vspgwu.yaml
+++ b/jjb/verify/vspgwu.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vspgwu_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vspgwu_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vspgwu_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vtn-service.yaml b/jjb/verify/vtn-service.yaml
index 8f11c11..57b3dd1 100644
--- a/jjb/verify/vtn-service.yaml
+++ b/jjb/verify/vtn-service.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vtn-service_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vtn-service_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vtn-service_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vtr.yaml b/jjb/verify/vtr.yaml
index 6fea10b..0e002a3 100644
--- a/jjb/verify/vtr.yaml
+++ b/jjb/verify/vtr.yaml
@@ -17,6 +17,3 @@
           dependency-jobs: 'verify_vtr_licensed'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_vtr_tag-collision'
-      - 'api-test':
-          dependency-jobs: 'verify_vtr_sonarqube'
-          pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index 9ad3bf0..5ea83ae 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -18,9 +18,6 @@
           dependency-jobs: 'verify_xos-tosca_licensed'
       - 'python-unit-test':
           dependency-jobs: 'verify_xos-tosca_tag-collision'
-      - 'api-test':
-          pipeline_script: 'all-xos-api-test-helm.groovy'
-          dependency-jobs: 'verify_xos-tosca_unit-test'
 
 - job-group:
     name: 'publish-xos-tosca-jobs'