diff --git a/openpower/ext_interfaces/test_client_identifier.robot b/openpower/ext_interfaces/test_client_identifier.robot
index 194be6a..99c9924 100644
--- a/openpower/ext_interfaces/test_client_identifier.robot
+++ b/openpower/ext_interfaces/test_client_identifier.robot
@@ -17,7 +17,7 @@
 Test Setup        Printn
 Test Teardown     FFDC On Test Case Fail
 
-Force Tags        Client_Identifier
+Test Tags        Client_Identifier
 
 *** Test Cases ***
 
diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index 9fe0b70..0e29da5 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -15,7 +15,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Lock_Management
+Test Tags               Lock_Management
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index 5493d62..0b669d1 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -14,7 +14,7 @@
 Test Teardown     Test Teardown Execution
 Suite Teardown    Suite Teardown Execution
 
-Force Tags        Savearea_Management
+Test Tags        Savearea_Management
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmi.robot b/openpower/ext_interfaces/test_vmi.robot
index f036d5f..c3782fb 100644
--- a/openpower/ext_interfaces/test_vmi.robot
+++ b/openpower/ext_interfaces/test_vmi.robot
@@ -8,7 +8,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmi
+Test Tags        Vmi
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot b/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
index c39497e..973f26f 100644
--- a/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
+++ b/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
@@ -10,7 +10,7 @@
 Suite Setup       Suite Setup Execution
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmi_Multiple_Interfaces
+Test Tags        Vmi_Multiple_Interfaces
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index ed3cd67..2978480 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -13,7 +13,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmicert_Management
+Test Tags        Vmicert_Management
 
 
 *** Variables ***