diff --git a/tests/atests/common/run_robot.sh b/tests/atests/common/run_robot.sh
index 17847a1..32cd611 100755
--- a/tests/atests/common/run_robot.sh
+++ b/tests/atests/common/run_robot.sh
@@ -24,5 +24,5 @@
     robot -d $1 -v LOG_DIR:$1/voltha_test_results -v SIMTYPE:ponsim ./tests/atests/robot/voltha_automated_test_suite.robot
 elif [[ "${2}" == "bbsim" ]]
     then
-      robot -d $1 -v LOG_DIR:$1/voltha_test_results -v SIMTYPE:bbsim -e ponsim ./tests/atests/robot/voltha_automated_test_suite.robot
-fi
\ No newline at end of file
+      robot -d $1 -v LOG_DIR:$1/voltha_test_results -v SIMTYPE:bbsim -e ponsim --noncritical nc ./tests/atests/robot/voltha_automated_test_suite.robot
+fi
diff --git a/tests/atests/robot/voltha_automated_test_suite.robot b/tests/atests/robot/voltha_automated_test_suite.robot
index 24e690d..8a77db7 100755
--- a/tests/atests/robot/voltha_automated_test_suite.robot
+++ b/tests/atests/robot/voltha_automated_test_suite.robot
@@ -109,6 +109,7 @@
     ...                 were assigned an IP address. This happens automatically once all ONUs have
     ...                 been authenticated and the DHCP requests transition between the bbsim
     ...                 dhclient, dhcp server via the dhcpl2relay
+    [Tags]    nc
     H Set Log Dirs      ${ROOT_DIR}     ${VOLTHA_DIR}    ${LOG_DIR}
     H Configure         ${ONU_COUNT}
     Run Keyword If      '${SIMTYPE}' == 'ponsim'      Ponsim DHCP Steps
@@ -202,4 +203,4 @@
 
 BBSim DHCP Verification Step
     [Documentation]     Validate that all ONUs were assigned an IP address
-    Wait Until Keyword Succeeds  ${RETRY_TIMEOUT_60}    ${RETRY_INTERVAL_2}     Should Have Ips Assigned To All Onus
\ No newline at end of file
+    Wait Until Keyword Succeeds  ${RETRY_TIMEOUT_60}    ${RETRY_INTERVAL_2}     Should Have Ips Assigned To All Onus