diff --git a/tests/test_boot_devices.robot b/tests/test_boot_devices.robot
index 150db15..3584eec 100644
--- a/tests/test_boot_devices.robot
+++ b/tests/test_boot_devices.robot
@@ -9,9 +9,7 @@
 Resource        ../lib/boot_utils.robot
 
 Suite Setup     Test Suite Setup
-Test Setup      Pre Test Case Execution
 Test Teardown   Post Test Case Execution
-Suite Teardown  Close All Connections
 
 *** Variables ***
 
@@ -229,19 +227,12 @@
     ${output}=  Read Attribute  ${uri}  ${parm}
     Set Test Variable  ${OUTPUT}  ${output}
 
-Pre Test Case Execution
-   [Documentation]  Do the pre test setup.
-
-   Open Connection And Log In
-   Initialize DBUS cmd  "boot_flags"
-
 Post Test Case Execution
    [Documentation]  Do the post test teardown.
 
    FFDC On Test Case Fail
    Set Boot Source  ${BOOT_SOURCE_DEFAULT}
    Set Boot Mode  ${BOOT_MODE_REGULAR}
-   Close All Connections
 
 Test Suite Setup
     [Documentation]  Do the initial suite setup.
diff --git a/tests/test_boot_policies.robot b/tests/test_boot_policies.robot
index 3bb6f9a..f4c2bd7 100644
--- a/tests/test_boot_policies.robot
+++ b/tests/test_boot_policies.robot
@@ -10,7 +10,6 @@
 Resource           ../lib/boot_utils.robot
 
 Suite Setup        Suite Setup Execution
-Test Setup         Test Setup Execution
 Test Teardown      FFDC On Test Case Fail
 Suite Teardown     Suite Teardown Execution
 
@@ -165,12 +164,6 @@
     [Documentation]  Restore default settings.
     Set Boot Policy  ${ONETIME}
     Set Boot Source  ${BOOT_SOURCE_DEFAULT}
-    Close All Connections
-
-Test Setup Execution
-    [Documentation]  Do the initial test setup.
-    Open Connection And Log In
-    Initialize DBUS cmd  "boot_flags"
 
 Suite Setup Execution
     [Documentation]  Do the initial suite setup.