diff --git a/test/resources/microshift-process.resource b/test/resources/microshift-process.resource
index c4be64c254..60e7f430b1 100644
--- a/test/resources/microshift-process.resource
+++ b/test/resources/microshift-process.resource
@@ -94,6 +94,8 @@ Stop MicroShift
 Start MicroShift
     [Documentation]    Start the MicroShift service
     Systemctl With Retry    start    microshift.service
+    # Kubeconfig may change between restarts, ensure we are taking the latest one.
+    Setup Kubeconfig
 
 Enable MicroShift
     [Documentation]    Enable the MicroShift service
@@ -108,3 +110,5 @@ Cleanup MicroShift
     ...    return_stdout=True    return_stderr=True    return_rc=True
     Log Many    ${stdout}    ${stderr}    ${rc}
     Should Be Equal As Integers    ${rc}    0
+
+    Enable MicroShift
diff --git a/test/suites/greenboot/greenboot.robot b/test/suites/greenboot/greenboot.robot
index c56e75b5d3..0b7704cf3a 100644
--- a/test/suites/greenboot/greenboot.robot
+++ b/test/suites/greenboot/greenboot.robot
@@ -38,8 +38,9 @@ Simulate Service Failure
     Restart Greenboot And Wait For Success
     Disrupt Service
     Cleanup MicroShift    --all    --keep-images
+    # not using 'Start MicroShift' kw because it retries
     Run Keyword And Expect Error    0 != 1
-    ...    Systemctl    enable    --now microshift
+    ...    Systemctl    start    microshift
     Run Keyword And Expect Error    0 != 1
     ...    Restart Greenboot And Wait For Success
 
@@ -133,6 +134,6 @@ Disrupt Pod Network
 Cleanup And Start
     [Documentation]    Wipe Microshift data and start it.
     Cleanup MicroShift    --all    --keep-images
-    Systemctl    enable    --now microshift
+    Start MicroShift
     Setup Kubeconfig
     Restart Greenboot And Wait For Success
diff --git a/test/suites/standard/hostname.robot b/test/suites/standard/hostname.robot
index 002572415b..2f5940ea57 100644
--- a/test/suites/standard/hostname.robot
+++ b/test/suites/standard/hostname.robot
@@ -54,6 +54,5 @@ Setup Hostname
     IF    "${hostname}"=="${EMPTY}"    RETURN
     ${old}=    Change Hostname    ${hostname}
     Cleanup MicroShift    --all    --keep-images
-    Systemctl    enable    microshift
-    Restart MicroShift
+    Start MicroShift
     RETURN    ${old}