diff --git a/Makefile b/Makefile
index bf21b5a..78ad743 100755
--- a/Makefile
+++ b/Makefile
@@ -328,7 +328,7 @@
 bbsim-failurescenarios-tt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_TT_SINGLE_PON_FILE)
 bbsim-failurescenarios-tt: voltha-tt-test
 
-voltha-test: ROBOT_MISC_ARGS += -e notready
+voltha-test: ROBOT_MISC_ARGS += -e notready --noncritical non-critical
 
 voltha-test: vst_venv
 	source ./$</bin/activate ; set -u ;\
@@ -416,7 +416,7 @@
 	cd tests/software-upgrades ;\
 	robot -V $(ROBOT_CONFIG_FILE) $(ROBOT_MISC_ARGS) $(ROBOT_FILE)
 
-voltha-dt-test: ROBOT_MISC_ARGS += -e notready
+voltha-dt-test: ROBOT_MISC_ARGS += -e notready  --noncritical non-critical
 
 voltha-dt-test: vst_venv
 	source ./$</bin/activate ; set -u ;\