diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index c722b02..3d6f6b8 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -277,7 +277,7 @@
     stage('Run E2E Tests') {
       environment {
         ROBOT_CONFIG_FILE="${localDeploymentConfigFile}"
-        ROBOT_MISC_ARGS="--removekeywords wuks -e bbsim -d $WORKSPACE/RobotLogs"
+        ROBOT_MISC_ARGS="{params.extraRobotArgs} --removekeywords wuks -d $WORKSPACE/RobotLogs"
         ROBOT_FILE="Voltha_PODTests.robot"
       }
       steps {
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 9564c64..82b3833 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -323,6 +323,11 @@
           default: true
           description: "Build with Gerrit patchset"
 
+      - string:
+          name: extraRobotArgs
+          default: '-i sanity'
+          description: 'Arguments to pass to robot'
+
     project-type: pipeline
     concurrent: true
 
@@ -339,12 +344,26 @@
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: '^hardware test$'
+          projects:
+            - project-compare-type: REG_EXP
+              project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py)$'
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: 'master'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          dependency-jobs: '{dependency-jobs}'
+          silent-start: false
+          successful-message: "PASSED hardware test"
+          failure-message: "FAILED hardware test"
+          unstable-message: "UNSTABLE hardware test"
+          trigger-on:
             - comment-added-event:
                 approval-category: 'Code-Review'
                 approval-value: '+2'
           projects:
             - project-compare-type: REG_EXP
-              project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py)$'
+              project-pattern: '^(voltha-openolt-adapter|voltha-openonu-adapter)$'
               branches:
                 - branch-compare-type: PLAIN
                   branch-pattern: 'master'
@@ -461,6 +480,11 @@
           default: false
           description: "Build with Gerrit patchset"
 
+      - string:
+          name: extraRobotArgs
+          default: '-e bbsim'
+          description: 'Arguments to pass to robot'
+
     project-type: pipeline
     concurrent: true