diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php
index b7c1921..2af228a 100644
--- a/tests/TestBaseApi.php
+++ b/tests/TestBaseApi.php
@@ -131,7 +131,6 @@ class TestBaseApi extends TestBase
      */
     protected function getLoggedInRequest($urlSuffix = null, $auth = true)
     {
-        $req = $this->getRequest($urlSuffix);
         if (is_array($auth)) {
             list($username, $password) = $auth;
         } else {
@@ -140,8 +139,22 @@ class TestBaseApi extends TestBase
         }
         $uid = $this->addUser($username, $password);
 
-        //FIXME: login via the login form, check if it worked
-        //FIXME: prepare new request with cookie
+        $req = new HTTP_Request2(
+            $GLOBALS['unittestUrl'] . '/login.php',
+            HTTP_Request2::METHOD_POST
+        );
+        $cookies = $req->setCookieJar()->getCookieJar();
+        $req->addPostParameter('username', $username);
+        $req->addPostParameter('password', $password);
+        $req->addPostParameter('submitted', 'Log In');
+        $res = $req->send();
+
+        //after login, we normally get redirected
+        $this->assertEquals(302, $res->getStatus(), 'Login failure');
+
+        $req = $this->getRequest($urlSuffix);
+        $req->setCookieJar($cookies);
+
         return array($req, $uid);
     }
 
diff --git a/tests/ajax/GetContactTagsTest.php b/tests/ajax/GetContactTagsTest.php
index 7f46888..757dce9 100644
--- a/tests/ajax/GetContactTagsTest.php
+++ b/tests/ajax/GetContactTagsTest.php
@@ -47,13 +47,17 @@ class ajax_GetContactTagsTest extends TestBaseApi
     }
 
 
-    public function testUserLoggedIn()
+    public function testUserLoggedInWatchlist()
     {
-        list($req, $uId) = $this->getAuthRequest();
-        $this->addBookmark($uId, null, 0, array('public'));
-        $this->addBookmark($uId, null, 1, array('shared'));
-        $this->addBookmark($uId, null, 2, array('private'));
-        
+        list($req, $uId) = $this->getLoggedInRequest();
+        $this->addBookmark($uId, null, 0, array('public', 'public2'));
+
+        $user2 = $this->addUser();
+        $this->us->setCurrentUserId($uId);
+        $this->us->setWatchStatus($user2);
+        //uId watches user2 now
+        $this->addBookmark($user2, null, 0, array('user2tag'));
+
         $res = $req->send();
         $this->assertEquals(200, $res->getStatus());
         $this->assertEquals(
@@ -64,8 +68,8 @@ class ajax_GetContactTagsTest extends TestBaseApi
         $this->assertInternalType('array', $data);
         $this->assertEquals(3, count($data));
         $this->assertContains('public', $data);
-        $this->assertContains('shared', $data);
-        $this->assertContains('private', $data);
+        $this->assertContains('public2', $data);
+        $this->assertContains('user2tag', $data);
     }
 }