diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 728ccad..f565c37 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -903,9 +903,13 @@
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
     <<: *test-pipe-job-boiler-plate
+    pipeline-script: 'voltha-physical-functional-tests.groovy'
+    manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
+    manifest-branch: 'master'
+
     parameters:
       - string:
-          name: TestNodeName
+          name: buildNode
           default: '{testvm}'
           description: 'Jenkins node name of TestVM Node'
 
@@ -947,21 +951,23 @@
       - string:
           name: branch
           default: '{branch}'
+          description: 'Branch of the test libraries to check out'
 
       - string:
-          name: notificationEmail
-          default: 'you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
+          name: manifestUrl
+          default: '{manifest-url}'
+          description: 'Repo manifest URL for code checkout (so we can display changes in Jenkins)'
+
+      - string:
+          name: manifestBranch
+          default: '{manifest-branch}'
+          description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
+
 
     concurrent: true
 
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/voltha-system-tests'
-            branches:
-              - '{branch}'
+    project-type: pipeline
+    dsl: !include-raw-escape: ../pipeline/{pipeline-script}
 
     triggers:
       - reverse:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 60bf08f..21ba3bd 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -9,15 +9,15 @@
     build-timeout: '300'
 
     jobs:
-      # flex OCP pod with olt/onu - release voltha master build job
+      # flex OCP pod with olt/onu - manual test job, voltha master build job
       - 'build_pod_manual':
           testvm: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
           test-repo: 'voltha-system-tests'
-          Jenkinsfile: 'Jenkinsfile-voltha-build'
-          oltDebVersion: 'openolt-seba-2.0.deb'
+          Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
+          oltDebVersion: 'openolt_asfvolt16.deb'
           profile: '1T4GEM'
 
       # flex pod1 test job - using voltha branch
@@ -71,7 +71,6 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: 'Default'
-          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # flex OCP pod with olt/onu - uses 1TCONT/4GEMs tech profile on voltha - timer based job
       - 'build_voltha_pod_release':
@@ -95,7 +94,6 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM'
-          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release':
@@ -119,7 +117,6 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: 'Default'
-          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # Menlo pod with olt/onu - Default tech profile and timer based job
       - 'build_voltha_pod_release':
@@ -143,7 +140,6 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: 'Default'
-          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
       - 'build_voltha_pod_release':
@@ -167,7 +163,6 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM-bal31'
-          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # Menlo DEMO-POD - 1 1TCONT 4 4GEMs TechProfile - Manual build and test job
       - 'build_pod_manual':
diff --git a/jjb/pipeline/voltha-physical-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
similarity index 100%
rename from jjb/pipeline/voltha-physical-tests.groovy
rename to jjb/pipeline/voltha-physical-build-and-tests.groovy
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
new file mode 100644
index 0000000..aa9a782
--- /dev/null
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -0,0 +1,129 @@
+// Copyright 2017-present Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+node {
+  // Need this so that deployment_config has global scope when it's read later
+  deployment_config = null
+}
+
+pipeline {
+  /* no label, executor is determined by JJB */
+  agent {
+    label "${params.buildNode}"
+  }
+  options {
+    timeout(time: 60, unit: 'MINUTES')
+  }
+
+  environment {
+    KUBECONFIG="$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf"
+    VOLTCONFIG="$HOME/.volt/config-minimal"
+    PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$WORKSPACE/kind-voltha/bin"
+  }
+
+  stages {
+    stage ('Initialize') {
+      steps {
+        step([$class: 'WsCleanup'])
+        sh returnStdout: true, script: "git clone -b ${branch} ${cordRepoUrl}/${configBaseDir}"
+        script {
+          deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
+        }
+        // This checkout is just so that we can show changes in Jenkins
+        checkout(changelog: true,
+          poll: false,
+          scm: [$class: 'RepoScm',
+            manifestRepositoryUrl: "${params.manifestUrl}",
+            manifestBranch: "${params.manifestBranch}",
+            currentBranch: true,
+            destinationDir: 'voltha',
+            forceSync: true,
+            resetFirst: true,
+            quiet: true,
+            jobs: 4,
+            showAllChanges: true]
+          )
+        sh returnStdout: true, script: """
+        cd voltha
+        git clone -b ${branch} ${cordRepoUrl}/cord-tester
+        git clone -b ${branch} ${cordRepoUrl}/voltha # NOTE do we need the voltha source code??
+        """
+      }
+    }
+    stage('Subscriber Validation and Ping Tests') {
+      environment {
+        ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
+        ROBOT_MISC_ARGS="--removekeywords wuks -d $WORKSPACE/RobotLogs -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
+        ROBOT_FILE="Voltha_PODTests.robot"
+      }
+      steps {
+        sh """
+        mkdir -p $WORKSPACE/RobotLogs
+        make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
+        """
+      }
+    }
+  }
+
+  post {
+    always {
+      sh returnStdout: true, script: """
+      set +e
+      kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
+      kubectl get nodes -o wide
+      kubectl get pods -n voltha -o wide
+      ## get default pod logs
+      for pod in \$(kubectl get pods --no-headers | awk '{print \$1}');
+      do
+        if [[ \$pod == *"onos"* && \$pod != *"onos-service"* ]]; then
+          kubectl logs \$pod onos> $WORKSPACE/\$pod.log;
+        else
+          kubectl logs \$pod> $WORKSPACE/\$pod.log;
+        fi
+      done
+      ## get voltha pod logs
+      for pod in \$(kubectl get pods --no-headers -n voltha | awk '{print \$1}');
+      do
+        if [[ \$pod == *"-api-"* ]]; then
+          kubectl logs \$pod arouter -n voltha > $WORKSPACE/\$pod.log;
+        else
+          kubectl logs \$pod -n voltha > $WORKSPACE/\$pod.log;
+        fi
+      done
+      """
+      script {
+        deployment_config.olts.each { olt ->
+          sh returnStdout: true, script: """
+          sshpass -p ${olt.pass} scp ${olt.user}@${olt.ip}:/var/log/openolt.log $WORKSPACE/openolt-${olt.ip}.log || true
+          sed -i 's/\\x1b\\[[0-9;]*[a-zA-Z]//g' $WORKSPACE/openolt-${olt.ip}.log  # Remove escape sequences
+          """
+        }
+      }
+      step([$class: 'RobotPublisher',
+        disableArchiveOutput: false,
+        logFileName: 'RobotLogs/log*.html',
+        otherFiles: '',
+        outputFileName: 'RobotLogs/output*.xml',
+        outputPath: '.',
+        passThreshold: 100,
+        reportFileName: 'RobotLogs/report*.html',
+        unstableThreshold: 0
+        ]);
+      archiveArtifacts artifacts: '*.log'
+    }
+    unstable {
+      step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
+    }
+  }
+}
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index e499738..99273e5 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -33,7 +33,6 @@
           testvm: 'tucson-pod'
           config-pod: 'tucson-pod'
           branch: 'master'
-          pipeline-script: 'voltha-physical-tests.groovy'
           oltDebVersion: 'openolt_asfvolt16.deb'
           profile: 'Default'
           withPatchset: true
@@ -45,7 +44,6 @@
           testvm: 'tucson-pod'
           config-pod: 'tucson-pod'
           branch: 'master'
-          pipeline-script: 'voltha-physical-tests.groovy'
           oltDebVersion: 'openolt_asfvolt16.deb'
           profile: 'Default'
           withPatchset: false
@@ -97,7 +95,7 @@
           description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
 
     project-type: pipeline
-    concurrent: false
+    concurrent: true
 
     dsl: !include-raw-escape: pipeline/{pipeline-script}
 
@@ -188,6 +186,7 @@
                   Copyright (c) 2019 Open Networking Foundation (ONF)
     project-type: pipeline
     sandbox: true
+    pipeline-script: 'voltha-physical-build-and-tests.groovy'
 
     properties:
       - cord-infra-properties:
@@ -322,6 +321,7 @@
                   Copyright (c) 2019 Open Networking Foundation (ONF)
     project-type: pipeline
     sandbox: true
+    pipeline-script: 'voltha-physical-build-and-tests.groovy'
 
     properties:
       - cord-infra-properties: