diff --git a/tests/test_association.robot b/tests/test_association.robot
index 88e90d0..b7d456a 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -168,6 +168,7 @@
     [Documentation]     ***GOOD PATH***
     ...                 This test case is to verify that error log association
     ...                 does not change after open bmc reboot.\n
+    [Tags]  bmcreboot
 
     ${pre_reboot_log_uri} =      Create a test log
     ${association_uri} =    catenate    SEPARATOR=   ${pre_reboot_log_uri}   /fru
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index 6a4d1a2..8d7246f 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -2,6 +2,7 @@
 Documentation       This module will test basic power on use cases for CI
 
 Resource            ../lib/rest_client.robot
+Force Tags  chassisboot
 
 Test template       power on tests
 
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index 173f5e6..51c1f54 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -58,6 +58,7 @@
 Boot order with permanent boot policy
     [Documentation]   This testcase is to verify that boot order does not change
     ...               after first boot when boot policy set to permanent
+    [Tags]  chassisboot
 
     Initiate Power Off
 
@@ -77,6 +78,8 @@
     [Documentation]   This testcase is to verify that boot policy and order does not change
     ...               after warm reset on a system with onetime boot policy.
 
+    [Tags]  chassisboot
+
     Initiate Power On
 
     Set Boot Policy   ONETIME
@@ -94,6 +97,7 @@
 Permanent boot order after warm reset
     [Documentation]   This testcase is to verify that boot policy and order does not change  
     ...               after warm reset on a system with permanent boot policy.
+    [Tags]  chassisboot
 
     Initiate Power On
 
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index b71e330..c2f5b25 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -157,7 +157,7 @@
     ...                     Events should exist post reboot,
     ...                     Create two more events,
     ...                     Delete old and new event
-    [Tags]      reboot_tests
+    [Tags]      bmcreboot
     ${pre_reboot_event}=         create a test log
 
     ${output}=      Execute Command    /sbin/reboot
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index 4d908be..e851931 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -12,6 +12,7 @@
 
 Suite setup		setup the suite
 
+Force Tags  chassisboot
 
 *** Test Cases ***
 
diff --git a/tests/test_power_restore.robot b/tests/test_power_restore.robot
index 15fff11..35955a2 100644
--- a/tests/test_power_restore.robot
+++ b/tests/test_power_restore.robot
@@ -10,6 +10,7 @@
 
 Library         SSHLibrary
 
+Force Tags      chassisboot  bmcreboot
 
 ***test cases***
 
@@ -29,7 +30,6 @@
     ...               in the Expected state then do the power cycle.
 
     [Template]    setRestorePolicy
-    [Tags]        reboot_tests
 
 ***keywords***
 setRestorePolicy
diff --git a/tests/test_syslog.robot b/tests/test_syslog.robot
index 3b9a409..a98fd7f 100755
--- a/tests/test_syslog.robot
+++ b/tests/test_syslog.robot
@@ -107,6 +107,7 @@
 Persistency check for syslog setting
     [Documentation]   This test case is to verify that syslog setting does not change
     ...               after service processor reboot.
+    [Tags]  bmcreboot
 
     ${old_ip}=   Read Attribute   /org/openbmc/LogManager/rsyslog   ipaddr
     ${old_port}=   Read Attribute   /org/openbmc/LogManager/rsyslog   port
diff --git a/tests/test_warmreset.robot b/tests/test_warmreset.robot
index a1e0ffa..352ddf8 100644
--- a/tests/test_warmreset.robot
+++ b/tests/test_warmreset.robot
@@ -5,6 +5,8 @@
 Resource                ../lib/utils.robot
 Resource                ../lib/connection_client.robot
 
+Force Tags  bmcreboot
+
 Suite Setup             Open Connection And Log In
 Suite Teardown          Close All Connections
 
@@ -14,7 +16,6 @@
 *** Test Cases ***
 
 Test WarmReset via REST
-    [Tags]      reboot_tests
     ${warm_test_file}=  Set Variable    /tmp/before_warmreset
     Open Connection And Log In
     ${stdout}   ${stderr}   ${rc}=  Execute Command     touch ${warm_test_file}     return_stderr=True  return_rc=True
diff --git a/tox.ini b/tox.ini
index dffb8d7..9a188bd 100755
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,7 @@
     OPENBMC_MODEL=./data/Barreleye.py
 commands =
     {[testenv]commands}
-    python -m robot.run --exclude reboot_tests --argumentfile {env:ARG_FILE} {posargs}
+    python -m robot.run --argumentfile {env:ARG_FILE} {posargs}
 
 
 [testenv:palmetto]
@@ -41,7 +41,7 @@
     OPENBMC_MODEL=./data/Palmetto.py
 commands =
     {[testenv]commands}
-    python -m robot.run --exclude reboot_tests --argumentfile {env:ARG_FILE} {posargs}
+    python -m robot.run --argumentfile {env:ARG_FILE} {posargs}
 
 
 [testenv:firestone]
@@ -50,7 +50,7 @@
     OPENBMC_MODEL=./data/Firestone.py
 commands =
     {[testenv]commands}
-    python -m robot.run --exclude reboot_tests --argumentfile {env:ARG_FILE} {posargs}
+    python -m robot.run --argumentfile {env:ARG_FILE} {posargs}
 
 
 [testenv:garrison]
@@ -59,7 +59,7 @@
     OPENBMC_MODEL=./data/Garrison.py
 commands =
     {[testenv]commands}
-    python -m robot.run --exclude reboot_tests --argumentfile {env:ARG_FILE} {posargs}
+    python -m robot.run --argumentfile {env:ARG_FILE} {posargs}
 
 
 [testenv:qemu]
@@ -68,4 +68,4 @@
     OPENBMC_MODEL=./data/Palmetto.py
 commands =
     {[testenv]commands}
-    python -m robot.run --exclude reboot_tests --argumentfile {env:ARG_FILE} {posargs}
+    python -m robot.run -e bmcreboot -e chassisboot --argumentfile {env:ARG_FILE} {posargs}