diff --git a/tests/lib/ContactsManagerTest.php b/tests/lib/ContactsManagerTest.php
index 89a9cb95b9..c460330e7e 100644
--- a/tests/lib/ContactsManagerTest.php
+++ b/tests/lib/ContactsManagerTest.php
@@ -2,6 +2,8 @@
 
 namespace Test;
 
+use OCP\IAddressBook;
+
 class ContactsManagerTest extends \Test\TestCase {
 
 	/** @var \OC\ContactsManager */
@@ -61,6 +63,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	 * @dataProvider searchProvider
 	 */
 	public function testSearch($search1, $search2, $expectedResult ){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook1 = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -94,6 +97,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	
 
 	public function testDeleteHavePermission(){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -113,6 +117,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	}
 
 	public function testDeleteNoPermission(){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -130,6 +135,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	}
 
 	public function testDeleteNoAddressbook(){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -144,6 +150,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	}
 
 	public function testCreateOrUpdateHavePermission(){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -162,6 +169,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	}
 
 	public function testCreateOrUpdateNoPermission(){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -180,6 +188,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	}
 
 	public function testCreateOrUpdateNOAdressbook(){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -198,6 +207,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	}
 
 	public function testIsEnabledIfSo(){
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
 			->getMock();
@@ -207,4 +217,26 @@ class ContactsManagerTest extends \Test\TestCase {
 		$this->assertTrue($result);
 	}
 
+	public function testAddressBookEnumeration() {
+		// create mock for the addressbook
+		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
+		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
+			->disableOriginalConstructor()
+			->getMock();
+
+		// setup return for method calls
+		$addressbook->expects($this->any())
+			->method('getKey')
+			->will($this->returnValue('SIMPLE_ADDRESS_BOOK'));
+		$addressbook->expects($this->any())
+			->method('getDisplayName')
+			->will($this->returnValue('A very simple Addressbook'));
+
+		// register the address book
+		$this->cm->registerAddressBook($addressbook);
+		$all_books = $this->cm->getAddressBooks();
+
+		$this->assertEquals(1, count($all_books));
+		$this->assertEquals('A very simple Addressbook', $all_books['SIMPLE_ADDRESS_BOOK']);
+	}
 }
diff --git a/tests/lib/PublicNamespace/ContactsTest.php b/tests/lib/PublicNamespace/ContactsTest.php
deleted file mode 100644
index 58e3deea61..0000000000
--- a/tests/lib/PublicNamespace/ContactsTest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Thomas Müller
- * @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Test\PublicNamespace;
-
-use OCP\IAddressBook;
-
-class ContactsTest extends \Test\TestCase {
-	protected function setUp() {
-		parent::setUp();
-		\OC::$server->getContactsManager()->clear();
-	}
-
-	public function testDisabledIfEmpty() {
-		// pretty simple
-		$this->assertFalse(\OC::$server->getContactsManager()->isEnabled());
-	}
-
-	public function testEnabledAfterRegister() {
-		$cm = \OC::$server->getContactsManager();
-
-		// create mock for the addressbook
-		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $stub */
-		$stub = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey'));
-
-		// we expect getKey to be called twice:
-		// first time on register
-		// second time on un-register
-		$stub->expects($this->exactly(2))
-			->method('getKey');
-
-		// not enabled before register
-		$this->assertFalse($cm->isEnabled());
-
-		// register the address book
-		$cm->registerAddressBook($stub);
-
-		// contacts api shall be enabled
-		$this->assertTrue($cm->isEnabled());
-
-		// unregister the address book
-		$cm->unregisterAddressBook($stub);
-
-		// not enabled after register
-		$this->assertFalse($cm->isEnabled());
-	}
-
-	public function testAddressBookEnumeration() {
-		// create mock for the addressbook
-		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $stub */
-		$stub = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName'));
-
-		// setup return for method calls
-		$stub->expects($this->any())
-			->method('getKey')
-			->will($this->returnValue('SIMPLE_ADDRESS_BOOK'));
-		$stub->expects($this->any())
-			->method('getDisplayName')
-			->will($this->returnValue('A very simple Addressbook'));
-
-		// register the address book
-		$cm = \OC::$server->getContactsManager();
-		$cm->registerAddressBook($stub);
-		$all_books = $cm->getAddressBooks();
-
-		$this->assertEquals(1, count($all_books));
-		$this->assertEquals('A very simple Addressbook', $all_books['SIMPLE_ADDRESS_BOOK']);
-	}
-
-	public function testSearchInAddressBook() {
-		// create mock for the addressbook
-		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $stub1 */
-		$stub1 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
-		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $stub2 */
-		$stub2 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
-
-		$searchResult1 = array(
-			array('id' => 0, 'FN' => 'Frank Karlitschek', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
-			array('id' => 5, 'FN' => 'Klaas Freitag', 'EMAIL' => array('d@e.f', 'g@h.i')),
-		);
-		$searchResult2 = array(
-			array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c'),
-			array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
-		);
-
-		// setup return for method calls for $stub1
-		$stub1->expects($this->any())->method('getKey')->will($this->returnValue('SIMPLE_ADDRESS_BOOK1'));
-		$stub1->expects($this->any())->method('getDisplayName')->will($this->returnValue('Address book ownCloud Inc'));
-		$stub1->expects($this->any())->method('search')->will($this->returnValue($searchResult1));
-
-		// setup return for method calls for $stub2
-		$stub2->expects($this->any())->method('getKey')->will($this->returnValue('SIMPLE_ADDRESS_BOOK2'));
-		$stub2->expects($this->any())->method('getDisplayName')->will($this->returnValue('Address book ownCloud Community'));
-		$stub2->expects($this->any())->method('search')->will($this->returnValue($searchResult2));
-
-		// register the address books
-		$cm = \OC::$server->getContactsManager();
-		$cm->registerAddressBook($stub1);
-		$cm->registerAddressBook($stub2);
-		$all_books = $cm->getAddressBooks();
-
-		// assert the count - doesn't hurt
-		$this->assertEquals(2, count($all_books));
-
-		// perform the search
-		$result = $cm->search('x', array());
-
-		// we expect 4 hits
-		$this->assertEquals(4, count($result));
-
-	}
-}