diff -urN ../roundcubemail-1.5.0.orig/tests/Actions/Contacts/Copy.php ./tests/Actions/Contacts/Copy.php
--- ../roundcubemail-1.5.0.orig/tests/Actions/Contacts/Copy.php	2021-10-17 23:36:20.000000000 +0300
+++ ./tests/Actions/Contacts/Copy.php	2023-04-22 21:01:35.819801281 +0300
@@ -106,7 +106,7 @@
         $query  = $db->query('SELECT count(*) AS cnt FROM `contacts` WHERE `user_id` = 1 AND `email` = ?', 'test@recipient.com');
         $result = $db->fetch_assoc($query);
 
-        $this->assertSame('1', $result['cnt']);
+        $this->assertSame(1, $result['cnt']);
     }
 
     /**
diff -urN ../roundcubemail-1.5.0.orig/tests/Actions/Contacts/List.php ./tests/Actions/Contacts/List.php
--- ../roundcubemail-1.5.0.orig/tests/Actions/Contacts/List.php	2021-10-17 23:36:20.000000000 +0300
+++ ./tests/Actions/Contacts/List.php	2023-04-22 22:22:42.575868119 +0300
@@ -34,8 +34,8 @@
         $this->assertSame('this.set_group_prop(null);', $commands[0]);
         $this->assertSame('this.set_rowcount("Contacts 1 to 6 of 6");', $commands[1]);
         $this->assertStringMatchesFormat(
-            'this.add_contact_row("%i",{"name":"George Bush"},"person",'
-            . '{"name":"George Bush","email":"g.bush@gov.com","ID":"%i"});',
+            'this.add_contact_row(%i,{"name":"George Bush"},"person",'
+            . '{"name":"George Bush","email":"g.bush@gov.com","ID":%i});',
             $commands[2]
         );
     }