diff --git a/.drone.yml b/.drone.yml
index 78cdefd82b45865ad57a6f4e74bbf8bdc9679e3a..2b5407e0df61dd74799c403b421f0ed3b501469f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -100,7 +100,7 @@ pipeline:
         DB: NODB
         PHP: "7.0"
   nodb-php7.1:
-    image: nextcloudci/php7.1:php7.1-5
+    image: nextcloudci/php7.1:php7.1-6
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -124,7 +124,7 @@ pipeline:
         DB: sqlite
         PHP: "7.0"
   sqlite-php7.1:
-    image: nextcloudci/php7.1:php7.1-5
+    image: nextcloudci/php7.1:php7.1-6
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php
index 71c918af6c7deb85ae4b1455990dd12f052ed0f1..5bacc794ba77e32defe6773e8cd525499b437806 100644
--- a/tests/lib/Comments/ManagerTest.php
+++ b/tests/lib/Comments/ManagerTest.php
@@ -111,7 +111,7 @@ class ManagerTest extends TestCase {
 		$this->assertSame($comment->getVerb(), 'comment');
 		$this->assertSame($comment->getObjectType(), 'files');
 		$this->assertSame($comment->getObjectId(), 'file64');
-		$this->assertEquals($comment->getCreationDateTime(), $creationDT);
+		$this->assertEquals($comment->getCreationDateTime()->getTimestamp(), $creationDT->getTimestamp());
 		$this->assertEquals($comment->getLatestChildDateTime(), $latestChildDT);
 	}
 
@@ -373,7 +373,7 @@ class ManagerTest extends TestCase {
 
 		$loadedComment = $manager->get($comment->getId());
 		$this->assertSame($comment->getMessage(), $loadedComment->getMessage());
-		$this->assertEquals($comment->getCreationDateTime(), $loadedComment->getCreationDateTime());
+		$this->assertEquals($comment->getCreationDateTime()->getTimestamp(), $loadedComment->getCreationDateTime()->getTimestamp());
 	}
 
 	public function testSaveUpdate() {
@@ -444,7 +444,7 @@ class ManagerTest extends TestCase {
 			$this->assertSame($comment->getTopmostParentId(), strval($id));
 			$parentComment = $manager->get(strval($id));
 			$this->assertSame($parentComment->getChildrenCount(), $i + 1);
-			$this->assertEquals($parentComment->getLatestChildDateTime(), $comment->getCreationDateTime());
+			$this->assertEquals($parentComment->getLatestChildDateTime()->getTimestamp(), $comment->getCreationDateTime()->getTimestamp());
 		}
 	}
 
@@ -577,7 +577,7 @@ class ManagerTest extends TestCase {
 
 		$dateTimeGet = $manager->getReadMark('robot', '36',  $user);
 
-		$this->assertEquals($dateTimeGet, $dateTimeSet);
+		$this->assertEquals($dateTimeGet->getTimestamp(), $dateTimeSet->getTimestamp());
 	}
 
 	public function testSetMarkReadUpdate() {
diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index 0ae2ef922fc4bdc432a369d238fd5400a629a042..778c1cb5722c8fe9c8715a3ac3d412f0590b45fa 100644
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -743,7 +743,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$this->assertSame($path, $share2->getNode());
 		$this->assertSame('password', $share2->getPassword());
 		$this->assertSame('token', $share2->getToken());
-		$this->assertEquals($expireDate, $share2->getExpirationDate());
+		$this->assertEquals($expireDate->getTimestamp(), $share2->getExpirationDate()->getTimestamp());
 	}
 
 	public function testGetShareByToken() {