diff --git a/pldm/test_firmware_boot_side.robot b/pldm/test_firmware_boot_side.robot
index 2763e7b..0e55717 100755
--- a/pldm/test_firmware_boot_side.robot
+++ b/pldm/test_firmware_boot_side.robot
@@ -26,7 +26,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Firmware_Boot_Side
+Test Tags       Firmware_Boot_Side
 
 *** Variables ***
 
diff --git a/pldm/test_pldm_base.robot b/pldm/test_pldm_base.robot
index 67229af..e15b83f 100644
--- a/pldm/test_pldm_base.robot
+++ b/pldm/test_pldm_base.robot
@@ -8,7 +8,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Pldm_Base
+Test Tags       Pldm_Base
 
 *** Test Cases ***
 Verify Get PLDM Types
diff --git a/pldm/test_pldm_bios.robot b/pldm/test_pldm_bios.robot
index f2f0ca8..4778626 100755
--- a/pldm/test_pldm_bios.robot
+++ b/pldm/test_pldm_bios.robot
@@ -13,7 +13,7 @@
 Suite Setup      PLDM BIOS Suite Setup
 Suite Teardown   Run Keyword And Ignore Error  PLDM BIOS Suite Cleanup
 
-Force Tags       Pldm_Bios
+Test Tags       Pldm_Bios
 
 *** Test Cases ***
 
diff --git a/pldm/test_pldm_bios_attributes.robot b/pldm/test_pldm_bios_attributes.robot
index b17b2d3..a16a938 100755
--- a/pldm/test_pldm_bios_attributes.robot
+++ b/pldm/test_pldm_bios_attributes.robot
@@ -13,7 +13,7 @@
 Suite Setup      PLDM BIOS Attribute Suite Setup
 Suite Teardown   PLDM BIOS Attribute Suite Cleanup
 
-Force Tags       Pldm_Bios_Attributes
+Test Tags       Pldm_Bios_Attributes
 
 *** Variables ***
 
diff --git a/pldm/test_pldm_fru.robot b/pldm/test_pldm_fru.robot
index 55b7edc..7e07d55 100644
--- a/pldm/test_pldm_fru.robot
+++ b/pldm/test_pldm_fru.robot
@@ -9,7 +9,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Pldm_FRU
+Test Tags       Pldm_FRU
 
 *** Test Cases ***
 
diff --git a/pldm/test_pldm_oem.robot b/pldm/test_pldm_oem.robot
index d44b03f..913a8ad 100644
--- a/pldm/test_pldm_oem.robot
+++ b/pldm/test_pldm_oem.robot
@@ -9,7 +9,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Pldm_OEM
+Test Tags       Pldm_OEM
 
 *** Test Cases ***
 
diff --git a/pldm/test_pldm_platform.robot b/pldm/test_pldm_platform.robot
index fc68fb5..6453bfd 100644
--- a/pldm/test_pldm_platform.robot
+++ b/pldm/test_pldm_platform.robot
@@ -12,7 +12,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Pldmtool Platform Suite Cleanup
 
-Force Tags        Pldm_Platform
+Test Tags        Pldm_Platform
 
 *** Test Cases ***
 Verify GetPDR
diff --git a/pldm/test_redfish_bios_attributes.robot b/pldm/test_redfish_bios_attributes.robot
index 2e22fa1..e86765f 100755
--- a/pldm/test_redfish_bios_attributes.robot
+++ b/pldm/test_redfish_bios_attributes.robot
@@ -14,7 +14,7 @@
 Suite Setup      Redfish BIOS Suite Setup
 Suite Teardown   Run Keyword And Ignore Error  Redfish BIOS Suite Cleanup
 
-Force Tags       Redfish_Bios_Attributes
+Test Tags       Redfish_Bios_Attributes
 
 *** Variables ***