diff --git a/tests/integration/ContactsStoreUserProviderTest.php b/tests/integration/ContactsStoreUserProviderTest.php
index f247d2ca..30c2dfe2 100644
--- a/tests/integration/ContactsStoreUserProviderTest.php
+++ b/tests/integration/ContactsStoreUserProviderTest.php
@@ -276,14 +276,6 @@ public function testDisabled()
 
 	private function assertCanonicalizeEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $ignoreCase = false)
 	{
-		$constraint = new IsEqual(
-			$expected,
-			$delta,
-			$maxDepth,
-			true,
-			$ignoreCase
-		);
-
-		static::assertThat($actual, $constraint, $message);
+		$this->assertEquals($expected, $actual, $message, $delta, $maxDepth, true, $ignoreCase);
 	}
 }
diff --git a/tests/integration/db/PresenceMapperTest.php b/tests/integration/db/PresenceMapperTest.php
index e819f304..79b8748d 100644
--- a/tests/integration/db/PresenceMapperTest.php
+++ b/tests/integration/db/PresenceMapperTest.php
@@ -347,6 +347,9 @@ public function testGetConnectedUsersIfUserHasNot()
 	{
 		$this->setValueOfPrivateProperty($this->mapper, 'connectedUsers', []);
 		$this->setupContactsStoreAPI();
+		if (!Application::contactsStoreApiSupported()) {
+			$this->markTestSkipped();
+		}
 
 		$group = \OC::$server->getGroupManager()->createGroup('group1');
 		$group->addUser(\OC::$server->getUserManager()->get('derp'));