diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
index 643439ac24339b780c64ccca4f5ee015274546c2..924db8a27e83fc7c304357270a2a123f0931a571 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Page;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Kasper;
+use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Admin;
 
 /**
  * This testcase is used to check if a page can be added with the page module.
@@ -22,20 +22,19 @@ use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Kasper;
  */
 class AddPageInPageModuleCest
 {
-    public function _before(Kasper $I)
+    public function _before(Admin $I)
     {
-        $I->loginAsAdmin();
-    }
-
-    public function _after(Kasper $I)
-    {
-        $I->logout();
+        $I->useExistingSession();
+        // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
+        $I->waitForText('Web>Page module');
+        $I->switchToIFrame();
     }
 
     /**
-     * @param Kasper $I
+     * @param Admin $I
      */
-    public function tryToTest(Kasper $I)
+    public function tryToTest(Admin $I)
     {
         // Select page module
         $I->wantToTest('Add a page with page module');
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
index 16415c43273df0fbecf070cc1c6eb76746bc1c9e..94efd13a8ecec3d812e842b6e5d9b996d60a6319 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
@@ -44,8 +44,8 @@ class BookmarkCest
     public function _before(Admin $I)
     {
         $I->useExistingSession();
-        $I->switchToIFrame('content');
         // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
         $I->waitForText('Web>Page module');
     }
 
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
index 7fc4fde603106e44a05b769bf11a0b50b22726f0..2e9b5b86f4e7756dc499e63cde1cbe82ba72c49a 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
@@ -23,10 +23,10 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\Topbar;
 class HelpCest
 {
     /**
-    * Selector for the module container in the topbar
-    *
-    * @var string
-    */
+     * Selector for the module container in the topbar
+     *
+     * @var string
+     */
     public static $topBarModuleSelector = '#typo3-cms-backend-backend-toolbaritems-helptoolbaritem';
 
     /**
@@ -35,8 +35,8 @@ class HelpCest
     public function _before(Admin $I)
     {
         $I->useExistingSession();
-        $I->switchToIFrame('content');
         // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
         $I->waitForText('Web>Page module');
         $I->switchToIFrame();
     }
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
index 6655d25ff63eeab331817d27d9e822583071bd17..613e294de88f5249933e4e23f706bf904ac95bdb 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
@@ -27,6 +27,10 @@ class LogoCest
     public function _before(Admin $I)
     {
         $I->useExistingSession();
+        // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
+        $I->waitForText('Web>Page module');
+        $I->switchToIFrame();
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Profile/UsernameOnAvatarCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
similarity index 52%
rename from typo3/sysext/core/Tests/Acceptance/Backend/Profile/UsernameOnAvatarCest.php
rename to typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
index 8319d9a1ab230dc7b78f2b4307f664162930b85b..4c913cf491f02498a6ac3f25d8f5c4226b0b2b35 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Profile/UsernameOnAvatarCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Profile;
+namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,27 +14,26 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Profile;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Kasper;
+use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Admin;
 
 /**
- * This testcase is used to check if username is visible in the toolbar.
+ * This test case is used to check if username is visible in the toolbar.
  */
 class UsernameOnAvatarCest
 {
-    public function _before(Kasper $I)
+    public function _before(Admin $I)
     {
-        $I->loginAsAdmin();
-    }
-
-    public function _after(Kasper $I)
-    {
-        $I->logout();
+        $I->useExistingSession();
+        // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
+        $I->waitForText('Web>Page module');
+        $I->switchToIFrame();
     }
 
     /**
-     * @param Kasper $I
+     * @param Admin $I
      */
-    public function tryToTest(Kasper $I)
+    public function tryToTest(Admin $I)
     {
         $I->see('admin', '#typo3-cms-backend-backend-toolbaritems-usertoolbaritem');
     }