diff --git a/.travis.yml b/.travis.yml
index 627350a1..001e7dbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ services:
 
 env:
   global:
-    - BRANCH=master
+    - BRANCH=contactsstore_public_api
     - REPO=nc
   matrix:
     - DB=mysql
diff --git a/appinfo/application.php b/appinfo/application.php
index 0a85ce59..ecd58d42 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -244,7 +244,7 @@ public function __construct(array $urlParams=array()){
 
 		$container->registerService('UserProvider', function(IContainer $c) {
 			$version = \OCP\Util::getVersion();
-			if (($version[0] == 12 && $version[2] >= 2) || ($version[0] >= 13)) {
+			if ($version[0] == 13) {
 				return new ContactsStoreUserProvider(
 					$c->query('OCP\Contacts\ContactsMenu\IContactsStore'),
 					$c->query('ServerContainer')->getUserSession(),
diff --git a/tests/integration/db/PresenceMapperTest.php b/tests/integration/db/PresenceMapperTest.php
index 681233f2..145af92e 100644
--- a/tests/integration/db/PresenceMapperTest.php
+++ b/tests/integration/db/PresenceMapperTest.php
@@ -80,6 +80,8 @@ public function setupContactsStoreAPI() {
 			$syncService->updateUser($user);
 		}
 
+		\OC_User::setIncognitoMode(false);
+
 		\OC::$server->getDatabaseConnection()->executeQuery("DELETE FROM *PREFIX*ojsxc_stanzas");
 
 	}