diff --git a/Makefile b/Makefile
index ec52708..539a3e4 100755
--- a/Makefile
+++ b/Makefile
@@ -523,11 +523,18 @@
 
 # Voltha Components to test for Software Upgrade need to be passed in the 'voltha_comps_under_test' variable in format:
 # <comp-label>,<comp-container>,<comp-image>*<comp-label>,<comp-container>,<comp-image>*
-voltha-comp-upgrade-test: ROBOT_MISC_ARGS +=  -e notready -i functional
+voltha-comp-upgrade-test: ROBOT_MISC_ARGS +=  -e notready -i VolthaCompMinorVerUpgrade
 voltha-comp-upgrade-test: ROBOT_FILE := Voltha_ComponentsUpgrade.robot
 voltha-comp-upgrade-test: ROBOT_CONFIG_FILE := $(ROBOT_SW_UPGRADE_FILE)
 voltha-comp-upgrade-test: software-upgrade-test
 
+# Voltha Components to test for Software Upgrade need to be passed in the 'voltha_comps_under_test' variable in format:
+# <comp-label>,<comp-container>,<comp-image>*<comp-label>,<comp-container>,<comp-image>*
+voltha-comp-rolling-upgrade-test: ROBOT_MISC_ARGS +=  -e notready -i VolthaCompMinorVerRollingUpgrade
+voltha-comp-rolling-upgrade-test: ROBOT_FILE := Voltha_ComponentsUpgrade.robot
+voltha-comp-rolling-upgrade-test: ROBOT_CONFIG_FILE := $(ROBOT_SW_UPGRADE_FILE)
+voltha-comp-rolling-upgrade-test: software-upgrade-test
+
 # Requirement: Pass ONU image details in following parameters
 # image_version, image_url, image_vendor, image_activate_on_success, image_commit_on_success, image_crc
 onu-upgrade-test: ROBOT_MISC_ARGS +=  -e notready -i functional
diff --git a/tests/software-upgrades/Voltha_ComponentsUpgrade.robot b/tests/software-upgrades/Voltha_ComponentsUpgrade.robot
index 6d5f150..cb528fa 100755
--- a/tests/software-upgrades/Voltha_ComponentsUpgrade.robot
+++ b/tests/software-upgrades/Voltha_ComponentsUpgrade.robot
@@ -125,7 +125,7 @@
     ...    Requirement: Components to test needs to be passed in robot command variable 'voltha_comps_under_test' in the format:
     ...    <comp-label>,<comp-container>,<comp-image>*<comp-label>,<comp-container>,<comp-image>*
     ...    Check [VOL-4534] for more details
-    [Tags]    functional   VolthaCompMinorVeriRollingUpgrade
+    [Tags]    functional   VolthaCompMinorVerRollingUpgrade
     [Setup]    Start Logging    VolthaCompMinorVerRollingUpgrade
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    VolthaCompMinorVerRollingUpgrade