diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 9d6f665..a7f26c9 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -626,6 +626,7 @@
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
           power-switch: True
+          pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
      # Berlin pod with olt/onu - voltha-2.5 Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 00bfd35..c55dabd 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -16,7 +16,20 @@
     jobs:
       - 'verify-licensed'
       - 'tag-collision-reject'
-      - 'make-unit-test'
+      - 'make-unit-test':
+          dest-gopath: "github.com/opencord"
+          name-extension: "-lint"
+          unit-test-targets: 'lint sca'
+          unit-test-keep-going: 'true'
+          junit-allow-empty-results: true
+          build-node: 'ubuntu16.04-basebuild-2c-4g'
+      - 'make-unit-test':
+          dest-gopath: "github.com/opencord"
+          name-extension: "-tests"
+          unit-test-targets: 'test'
+          unit-test-keep-going: 'true'
+          junit-allow-empty-results: true
+          build-node: 'ubuntu16.04-basebuild-2c-4g'
       - 'voltha-patch-test':
           pipeline-script: 'voltha-openonu-go-tests.groovy'