diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index 841bd35..751c814 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -53,6 +53,7 @@
            export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
            export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
            export PATH=$WORKSPACE/kind-voltha/bin:$PATH
+           export ROBOT_VAR_FILE=$WORKSPACE/voltha-system-tests/tests/data/${robotVarFile}
            make -C $WORKSPACE/voltha-system-tests sanity-kind || true
            '''
       }
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 55543d6..c32a845 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -59,9 +59,14 @@
 
       - string:
           name: extraHelmFlags
-          default: '--set defaults.image_tag={default-image-tag}'
+          default: '--set defaults.image_tag={default-image-tag},onu=2,pon=2'
           description: 'Helm flags to pass to ./voltha up'
 
+      - string:
+          name: robotVarFile
+          default: 'bbsim-kind-2x2.yaml'
+          description: 'Pod config file to use for tests'
+
     project-type: pipeline
     concurrent: false