diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 4508349..4d04a03 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -15,7 +15,16 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-openolt-adapter_licensed'
-#     - 'verify-sonarqube':
-#         dependency-jobs: 'verify_voltha-openolt-adapter_tag-collision'
-#     - 'python-unit-test':
-#         dependency-jobs: 'verify_voltha-openolt-adapter_sonarqube'
+      - 'make-unit-test':
+          dest-gopath: "github.com/opencord"
+          name-extension: "-lint"
+          unit-test-targets: 'lint'
+          unit-test-keep-going: 'true'
+          junit-allow-empty-results: true
+      - 'make-unit-test':
+          build-node: 'ubuntu16.04-basebuild-2c-4g'
+          dest-gopath: "github.com/opencord"
+          name-extension: "-tests"
+          unit-test-targets: 'test'
+          unit-test-keep-going: 'true'
+