diff --git a/pldm/test_firmware_boot_side.robot b/pldm/test_firmware_boot_side.robot
index bde3888..2763e7b 100755
--- a/pldm/test_firmware_boot_side.robot
+++ b/pldm/test_firmware_boot_side.robot
@@ -26,6 +26,8 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       Firmware_Boot_Side
+
 *** Variables ***
 
 # By default 2, to ensure, it performs both Perm and Temp side switch and boot.
diff --git a/pldm/test_pldm_base.robot b/pldm/test_pldm_base.robot
index a23b5b8..67229af 100644
--- a/pldm/test_pldm_base.robot
+++ b/pldm/test_pldm_base.robot
@@ -8,6 +8,8 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       Pldm_Base
+
 *** Test Cases ***
 Verify Get PLDM Types
     [Documentation]  Verify supported PLDM types.
diff --git a/pldm/test_pldm_bios.robot b/pldm/test_pldm_bios.robot
index 0e651b7..d62ea73 100755
--- a/pldm/test_pldm_bios.robot
+++ b/pldm/test_pldm_bios.robot
@@ -13,6 +13,8 @@
 Suite Setup      PLDM BIOS Suite Setup
 Suite Teardown   Run Keyword And Ignore Error  PLDM BIOS Suite Cleanup
 
+Force Tags       Pldm_Bios
+
 *** Test Cases ***
 
 Verify GetDateTime
diff --git a/pldm/test_pldm_bios_attributes.robot b/pldm/test_pldm_bios_attributes.robot
index 6f9d6cf..b17b2d3 100755
--- a/pldm/test_pldm_bios_attributes.robot
+++ b/pldm/test_pldm_bios_attributes.robot
@@ -13,6 +13,7 @@
 Suite Setup      PLDM BIOS Attribute Suite Setup
 Suite Teardown   PLDM BIOS Attribute Suite Cleanup
 
+Force Tags       Pldm_Bios_Attributes
 
 *** Variables ***
 
diff --git a/pldm/test_pldm_fru.robot b/pldm/test_pldm_fru.robot
index 0e6d7c6..55b7edc 100644
--- a/pldm/test_pldm_fru.robot
+++ b/pldm/test_pldm_fru.robot
@@ -9,6 +9,8 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       Pldm_FRU
+
 *** Test Cases ***
 
 Verify GetFruRecordTableMetadata
diff --git a/pldm/test_pldm_oem.robot b/pldm/test_pldm_oem.robot
index 112f8a5..d44b03f 100644
--- a/pldm/test_pldm_oem.robot
+++ b/pldm/test_pldm_oem.robot
@@ -9,6 +9,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       Pldm_OEM
 
 *** Test Cases ***
 
diff --git a/pldm/test_pldm_platform.robot b/pldm/test_pldm_platform.robot
index 78f11e1..333ede7 100644
--- a/pldm/test_pldm_platform.robot
+++ b/pldm/test_pldm_platform.robot
@@ -12,6 +12,8 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Pldmtool Platform Suite Cleanup
 
+Force Tags        Pldm_Platform
+
 *** Test Cases ***
 Verify GetPDR
     [Documentation]  Verify GetPDR (Platform Descpritor Record) response message.
diff --git a/pldm/test_redfish_bios_attributes.robot b/pldm/test_redfish_bios_attributes.robot
index 6b4f378..502a732 100755
--- a/pldm/test_redfish_bios_attributes.robot
+++ b/pldm/test_redfish_bios_attributes.robot
@@ -14,6 +14,8 @@
 Suite Setup      Redfish BIOS Suite Setup
 Suite Teardown   Run Keyword And Ignore Error  Redfish BIOS Suite Cleanup
 
+Force Tags       Redfish_Bios_Attributes
+
 *** Variables ***
 
 ${bios_original_data}       ${EMPTY}
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index ebd2b78..98f39ea 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -16,6 +16,7 @@
 
 Suite Setup       Suite Setup Execution
 
+Force Tags        Redfishtool_Certificate
 
 *** Variables ***
 
diff --git a/redfish/dmtf_tools/test_redfishtool_general.robot b/redfish/dmtf_tools/test_redfishtool_general.robot
index 2507b64..5d0dbe9 100644
--- a/redfish/dmtf_tools/test_redfishtool_general.robot
+++ b/redfish/dmtf_tools/test_redfishtool_general.robot
@@ -15,6 +15,7 @@
 
 Suite Setup       Suite Setup Execution
 
+Force Tags        Redfishtool_General
 
 *** Variables ***
 
diff --git a/redfish/dmtf_tools/test_redfishtool_local_user.robot b/redfish/dmtf_tools/test_redfishtool_local_user.robot
index 2e5147d..82dcc4e 100644
--- a/redfish/dmtf_tools/test_redfishtool_local_user.robot
+++ b/redfish/dmtf_tools/test_redfishtool_local_user.robot
@@ -15,6 +15,7 @@
 
 Suite Setup       Suite Setup Execution
 
+Force Tags        Redfishtool_Local_User
 
 *** Variables ***
 
diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index 3c33c69..0c7212f 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -8,6 +8,8 @@
 Test Teardown    FFDC On Test Case Fail
 Test Setup       Printn
 
+Force Tags       Service_Root
+
 *** Test Cases ***
 
 Redfish Login And Logout
diff --git a/redfish/task_service/test_tasks.robot b/redfish/task_service/test_tasks_service.robot
similarity index 99%
rename from redfish/task_service/test_tasks.robot
rename to redfish/task_service/test_tasks_service.robot
index d1fefc6..73d959b 100644
--- a/redfish/task_service/test_tasks.robot
+++ b/redfish/task_service/test_tasks_service.robot
@@ -13,6 +13,8 @@
 Suite Teardown      Suite Teardown Execution
 Test Teardown       FFDC On Test Case Fail
 
+Force Tags          Tasks_Service
+
 *** Variables ***
 ${TIME_REGEXP_PATTERN}   (.+)[\\-|\\+]\\d\\d\\:\\d\\d
 
diff --git a/redfish/telemetry_service/test_telemetry_report.robot b/redfish/telemetry_service/test_telemetry_report.robot
index 8f58443..bf1ba51 100644
--- a/redfish/telemetry_service/test_telemetry_report.robot
+++ b/redfish/telemetry_service/test_telemetry_report.robot
@@ -9,6 +9,8 @@
 Suite Teardown      Redfish.Logout
 Test Teardown       Test Teardown Execution
 
+Force Tags          Telemetry_Report
+
 *** Variables ***
 
 ${metric_definition_base_uri}  /redfish/v1/TelemetryService/MetricReportDefinitions