diff --git a/src/Dev/FunctionalTest.php b/src/Dev/FunctionalTest.php
index 6d265cae4..7e14e944c 100644
--- a/src/Dev/FunctionalTest.php
+++ b/src/Dev/FunctionalTest.php
@@ -100,6 +100,9 @@ class FunctionalTest extends SapphireTest implements TestOnly
             SSViewer::config()->update('theme_enabled', false);
         }
 
+        // Flush user
+        $this->logOut();
+
         // Switch to draft site, if necessary
         if (static::get_use_draft_site()) {
             $this->useDraftSite();
@@ -109,8 +112,6 @@ class FunctionalTest extends SapphireTest implements TestOnly
         // basis.
         BasicAuth::protect_entire_site(false);
 
-        $this->logOut();
-
         SecurityToken::disable();
     }