diff --git a/admin_menu.drush.inc b/admin_menu.drush.inc
index 1cc7d92..a8469a9 100644
--- a/admin_menu.drush.inc
+++ b/admin_menu.drush.inc
@@ -7,6 +7,8 @@
  * we build the links.
  */
 function admin_menu_drush_exit() {
-  admin_menu_exit();
+  if (function_exists('admin_menu_exit')) {
+    admin_menu_exit();
+  }
 }
 
diff --git a/tests/admin_menu.test b/tests/admin_menu.test
index a46db00..e780c06 100644
--- a/tests/admin_menu.test
+++ b/tests/admin_menu.test
@@ -8,24 +8,11 @@
  * the PCRE pattern, since admin menu's output spans over multiple lines.
  */
 
-class AdminMenuWebTestCase extends DrupalWebTestCase {
-  function setUp() {
-    parent::setUp('admin_menu', 'contact');
-    // Create and log in a full-blown administrative user.
-    $permissions = module_invoke_all('perm');
-    $this->admin_user = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->admin_user);
-    // Forcing a menu rebuild via the UI seems to be required for
-    // the tests to work.
-    $this->drupalPost('admin/settings/performance', array(), t('Clear cached data'));
-    $this->drupalLogout();
-  }
-}
 
 /**
  * Test menu links depending on user permissions.
  */
-class AdminMenuPermissionsTestCase extends AdminMenuWebTestCase {
+class AdminMenuPermissionsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => t('Menu link permissions'),
@@ -34,6 +21,11 @@ class AdminMenuPermissionsTestCase extends AdminMenuWebTestCase {
     );
   }
 
+  function setUp() {
+    parent::setUp('admin_menu');
+    admin_menu_exit();
+  }
+
   /**
    * Test that the links are added to the page (no JS testing).
    */
@@ -65,7 +57,7 @@ class AdminMenuPermissionsTestCase extends AdminMenuWebTestCase {
 /**
  * Test menu links depending on installed modules.
  */
-class AdminMenuModulesTestCase extends AdminMenuWebTestCase {
+class AdminMenuModulesTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => t('Module menu links'),
@@ -74,6 +66,11 @@ class AdminMenuModulesTestCase extends AdminMenuWebTestCase {
     );
   }
 
+  function setUp() {
+    parent::setUp('admin_menu', 'contact');
+    admin_menu_exit();
+  }
+
   /**
    * Test that the links are added to the page (no JS testing).
    */
@@ -100,7 +97,7 @@ class AdminMenuModulesTestCase extends AdminMenuWebTestCase {
 /**
  * Test contained links in administration menu.
  */
-class AdminMenuLinksTestCase extends AdminMenuWebTestCase {
+class AdminMenuLinksTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => t('Menu links'),
@@ -109,11 +106,19 @@ class AdminMenuLinksTestCase extends AdminMenuWebTestCase {
     );
   }
 
+  function setUp() {
+    parent::setUp('admin_menu');
+    admin_menu_exit();
+    // Create and log in a full-blown administrative user.
+    $permissions = module_invoke_all('perm');
+    $admin_user = $this->drupalCreateUser($permissions);
+    $this->admin_user = $this->drupalLogin($admin_user);
+  }
+
   /**
    * Test link contents.
    */
   function testLinkContents() {
-    $this->drupalLogin($this->admin_user);
     // Create a content-type with special characters.
     $info = array(
       'type' => 'special',