diff --git a/jjb/shell/licensecheck.sh b/jjb/shell/licensecheck.sh
index 445470e..5bbcdf8 100755
--- a/jjb/shell/licensecheck.sh
+++ b/jjb/shell/licensecheck.sh
@@ -96,6 +96,8 @@
   ! -name "*_pb2_grpc.py" \
   ! -name "Dockerfile" \
   ! -name "Dockerfile.*" \
+  ! -name "go.mod" \
+  ! -name "go.sum" \
   ! -name "Makefile" \
   ! -name "Makefile.*" \
   ! -name "README" \
@@ -103,8 +105,6 @@
   ! -path "*conf*" \
   ! -path "*git*" \
   ! -path "*swagger*" \
-  ! -path "go.mod" \
-  ! -path "go.sum" \
   -print0 )
 
 exit ${fail_licensecheck}
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index 2361b11..c7eb57f 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -17,11 +17,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-bbsim_licensed'
-#     - 'verify-sonarqube':
-#         dependency-jobs: 'verify_voltha-bbsim_tag-collision'
-      - 'voltha-bbsim-tests':
-          dependency-jobs: 'verify_voltha-bbsim_sonarqube'
-
+      - 'make-unit-test':
+          dest-gopath: "github.com/opencord"
 
 - job-group:
     name: 'publish-voltha-bbsim-jobs'
@@ -30,92 +27,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag'
-
-
-- job-template:
-    id: 'voltha-bbsim-tests'
-    name: 'verify_{project}_tests'
-
-    description: |
-      Created by {id} job-template from ci-management/jjb/verify/voltha-bbsim.yaml
-
-    triggers:
-      - cord-infra-gerrit-trigger-patchset:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^{project}$'
-          branch-regexp: '{branch-regexp}'
-          dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{all-files-regexp}'
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: 20
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    scm:
-      - cord-infra-gerrit-scm:
-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
-          choosing-strategy: 'gerrit'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          basedir: '{project}'
-
-    node: 'ubuntu16.04-basebuild-1c-2g'
-    project-type: freestyle
-    concurrent: true
-
-    builders:
-      - shell: |
-          #!/usr/bin/env bash
-          set -eux -o pipefail
-
-          export GOPATH=~/go
-          export PATH=$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:~/go/bin
-
-          # move code the proper location
-          mkdir -p $GOPATH/src/gerrit.opencord.org
-          mv voltha-bbsim $GOPATH/src/gerrit.opencord.org/voltha-bbsim
-
-          # get prereqs
-          go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
-          go get -v github.com/golang/protobuf/protoc-gen-go
-
-          pushd $GOPATH/src/gerrit.opencord.org/voltha-bbsim
-
-          make dep
-
-          # run tests as a developer would
-          make test
-
-          # generate Jenkins report
-          GO111MODULE=on go test -v ./...  2>&1 | go-junit-report > $WORKSPACE/junit-report.xml
-
-          # generate Jenkins coverage
-          GO111MODULE=on go test -coverprofile=coverage.txt -covermode=count ./...
-          gocover-cobertura < coverage.txt > $WORKSPACE/coverage.xml
-
-          popd
-
-
-    publishers:
-      - junit:
-          results: "junit-report.xml"
-          allow-empty-results: true
-      - cobertura:
-          report-file: "coverage.xml"
-          targets:
-            - files:
-                healthy: 80
-                unhealthy: 0
-                failing: 0
-            - method:
-                healthy: 50
-                unhealthy: 0
-                failing: 0