diff --git a/src/Tests/DatabaseStorageListTest.php b/src/Tests/DatabaseStorageListTest.php
index c7ead5b..2ba02f3 100644
--- a/src/Tests/DatabaseStorageListTest.php
+++ b/src/Tests/DatabaseStorageListTest.php
@@ -35,20 +35,20 @@ class DatabaseStorageListTest extends DatabaseStorageSortedTestBase {
     $this->assertPairs(array(2 => $value2, 3 => $value3, 4 => $value4));
 
     $count = $this->store->getCount();
-    $this->assertEqual($count, 5, 'The count method returned correct count.');
+    $this->assertEquals($count, 5, 'The count method returned correct count.');
 
     $value = $this->store->getRange(2, 4);
-    $this->assertIdentical($value, array($value2, $value3, $value4));
+    $this->assertSame($value, array($value2, $value3, $value4));
 
     $new3 = $this->randomMachineName();
     $this->store->set(3, $new3);
     $this->assertPairs(array(3 => $new3));
 
     $value = $this->store->getRange(3, 3);
-    $this->assertIdentical($value, array($new3), 'Value was successfully updated.');
+    $this->assertSame($value, array($new3), 'Value was successfully updated.');
     $this->assertRecords(5, 'Correct number of record in the collection after member update.');
 
     $value = $this->store->getRange(6, 10);
-    $this->assertIdentical($value, array(), 'Non-existing range returned empty array.');
+    $this->assertSame($value, array(), 'Non-existing range returned empty array.');
   }
 }
diff --git a/src/Tests/DatabaseStorageSortedSetTest.php b/src/Tests/DatabaseStorageSortedSetTest.php
index 0f72d8f..13e7249 100644
--- a/src/Tests/DatabaseStorageSortedSetTest.php
+++ b/src/Tests/DatabaseStorageSortedSetTest.php
@@ -42,25 +42,25 @@ class DatabaseStorageSortedSetTest extends DatabaseStorageSortedTestBase {
     ));
 
     $count = $this->store->getCount();
-    $this->assertEqual($count, 5, 'The count method returned correct count.');
+    $this->assertEquals($count, 5, 'The count method returned correct count.');
 
     $value = $this->store->getRange($key1, $key2);
-    $this->assertIdentical($value, array($value1, $value2, $value3, $value4));
+    $this->assertSame($value, array($value1, $value2, $value3, $value4));
 
     $new1 = $this->newKey();
     $this->store->add($new1, $value1);
 
     $value = $this->store->getRange($new1, $new1);
-    $this->assertIdentical($value, array($value1), 'Member was successfully updated.');
+    $this->assertSame($value, array($value1), 'Member was successfully updated.');
     $this->assertRecords(5, 'Correct number of record in the collection after member update.');
 
     $value = $this->store->getRange($key1, $key1);
-    $this->assertIdentical($value, array(), 'Non-existing range returned empty array.');
+    $this->assertSame($value, array(), 'Non-existing range returned empty array.');
 
     $max_score = $this->store->getMaxScore();
-    $this->assertEqual($max_score, $new1, 'The getMaxScore method returned correct score.');
+    $this->assertEquals($max_score, $new1, 'The getMaxScore method returned correct score.');
 
     $min_score = $this->store->getMinScore();
-    $this->assertEqual($min_score, $key0, 'The getMinScore method returned correct score.');
+    $this->assertEquals($min_score, $key0, 'The getMinScore method returned correct score.');
   }
 }
diff --git a/src/Tests/DatabaseStorageSortedTestBase.php b/src/Tests/DatabaseStorageSortedTestBase.php
index 3ca537e..bec5938 100644
--- a/src/Tests/DatabaseStorageSortedTestBase.php
+++ b/src/Tests/DatabaseStorageSortedTestBase.php
@@ -46,9 +46,9 @@ abstract class DatabaseStorageSortedTestBase extends KernelTestBase {
       ->fetchAllAssoc('name');
 
     $expected_count = count($expected_pairs);
-    $this->assertIdentical(count($result), $expected_count, "Query affected $expected_count records.");
+    $this->assertSame(count($result), $expected_count, "Query affected $expected_count records.");
     foreach ($expected_pairs as $key => $value) {
-      $this->assertIdentical($this->serializer->decode($result[$key]->value), $value, "Key $key have value $value");
+      $this->assertSame($this->serializer->decode($result[$key]->value), $value, "Key $key have value $value");
     }
   }
 
@@ -59,7 +59,7 @@ abstract class DatabaseStorageSortedTestBase extends KernelTestBase {
       ->countQuery()
       ->execute()
       ->fetchField();
-    $this->assertEqual($count, $expected, $message ? $message : "There are $expected records.");
+    $this->assertEquals($count, $expected, $message ? $message : "There are $expected records.");
   }
 
   public function newKey() {