diff --git a/scripts/microshift-cleanup-data.sh b/scripts/microshift-cleanup-data.sh
index 2144d0e87c..72b546fcb4 100755
--- a/scripts/microshift-cleanup-data.sh
+++ b/scripts/microshift-cleanup-data.sh
@@ -107,6 +107,11 @@ function clean_processes() {
         for pname in conmon pause ovn-controller ovn-northd ; do
             pkill -9 --exact ${pname} || true
         done
+        # OVS must be restarted to clear stale flow state left by the
+        # stopped ovsdb-server, otherwise OVN cannot reinitialize on
+        # the next MicroShift start.
+        echo Restarting openvswitch service
+        systemctl restart openvswitch.service 2>/dev/null || true
     fi
 }
 
diff --git a/test/suites/standard1/hostname.robot b/test/suites/standard1/hostname.robot
index 661341dabe..2cb792b4e8 100644
--- a/test/suites/standard1/hostname.robot
+++ b/test/suites/standard1/hostname.robot
@@ -13,7 +13,7 @@ Test Tags           restart    slow
 
 
 *** Variables ***
-${NEW_HOSTNAME}     microshift.local
+${NEW_HOSTNAME}     microshift-test.example
 ${OLD_HOSTNAME}     ${EMPTY}
 
 
@@ -29,7 +29,7 @@ Verify Local Host Name
     Should Contain    ${hostname}    standard
 
 Verify Local Host Name Resolution
-    [Documentation]    Verify correct host name resolution through mDNS
+    [Documentation]    Verify MicroShift restarts correctly after a hostname change
     [Setup]    Configure New Hostname
 
     Named Deployment Should Be Available    router-default    timeout=${DEFAULT_WAIT_TIMEOUT}    ns=openshift-ingress