diff --git a/extended/test_bios_update.robot b/extended/test_bios_update.robot
index 3d3e042..1b4305c 100644
--- a/extended/test_bios_update.robot
+++ b/extended/test_bios_update.robot
@@ -12,7 +12,7 @@
 
 Test Teardown           Test Bios Teardown
 
-Force Tags  PNOR_BIOS_Code_Update
+Force Tags  BIOS_Code_Update
 
 *** Variables ***
 
diff --git a/extended/test_esel.robot b/extended/test_esel.robot
index 2780273..ec54604 100644
--- a/extended/test_esel.robot
+++ b/extended/test_esel.robot
@@ -7,6 +7,7 @@
 Resource            ../lib/utils.robot
 Variables           ../data/variables.py
 Resource            ../lib/utils.robot
+Resource            ../lib/boot_utils.robot
 
 Suite Setup         eSEL Test SetUp
 Suite Teardown      Test Cleanup On Exit
@@ -192,6 +193,9 @@
     Should Not Be Empty
     ...   ${OS_PASSWORD}  msg=You must provide OS host user password.
 
+    # Boot to OS.
+    REST Power On
+
     Login To OS Host  ${OS_HOST}  ${OS_USERNAME}  ${OS_PASSWORD}
     Open Connection And Log In
 
diff --git a/extended/test_network_nping.robot b/extended/test_network_nping.robot
index b9a81c0..071f0a8 100644
--- a/extended/test_network_nping.robot
+++ b/extended/test_network_nping.robot
@@ -8,6 +8,8 @@
 
 Suite Setup  Validate Setup
 
+Force Tags  Network_Nping
+
 *** Variables ***
 
 ${delay}             200ms
diff --git a/extended/test_networkd_ext.robot b/extended/test_networkd_ext.robot
index 74e8337..b228aa4 100755
--- a/extended/test_networkd_ext.robot
+++ b/extended/test_networkd_ext.robot
@@ -11,6 +11,8 @@
 Suite Teardown      Close All Connections
 Test Teardown       FFDC On Test Case Fail
 
+Force Tags  Networkd_Ext
+
 *** Test Cases ***
 
 Set IP address on valid Interface