diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index 6532fda..39d879d 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -10,8 +10,6 @@
           branch-regexp: '{all-branches-regexp}'
       - 'publish-voltha-api-server-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'voltha-api-server-system-tests':
-          branch-regexp: '{all-branches-regexp}'
 
 - job-group:
     name: 'verify-voltha-api-server-jobs'
@@ -25,6 +23,8 @@
           unit-test-targets: 'lint test docker-build'
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
+      - 'voltha-patch-test':
+         pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-api-server-jobs'
@@ -33,10 +33,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag'
-
-- job-group:
-    name: 'voltha-api-server-system-tests'
-    jobs:
-      - 'voltha-patch-test':
-          buildImages: true
-          pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index c0feae2..41f2cc1 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -10,8 +10,6 @@
           branch-regexp: '{all-branches-regexp}'
       - 'publish-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'voltha-go-system-tests':
-          branch-regexp: '{voltha-stablization-branch}'
 
 - job-group:
     name: 'verify-voltha-go-jobs'
@@ -31,6 +29,8 @@
           name-extension: "-tests"
           unit-test-targets: 'test'
           unit-test-keep-going: 'true'
+      - 'voltha-patch-test':
+         pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-go-jobs'
@@ -39,10 +39,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag'
-
-- job-group:
-    name: 'voltha-go-system-tests'
-    jobs:
-      - 'voltha-patch-test':
-          buildImages: true
-          pipeline: 'voltha-bbsim-tests.groovy'