diff --git a/tests/PersistentSubscriptionManagement/persistent_subscription_manager.php b/tests/PersistentSubscriptionManagement/persistent_subscription_manager.php
index ed3b104a..ccd5f19c 100644
--- a/tests/PersistentSubscriptionManagement/persistent_subscription_manager.php
+++ b/tests/PersistentSubscriptionManagement/persistent_subscription_manager.php
@@ -110,11 +110,11 @@ public function can_describe_persistent_subscription(): Generator
             $details = yield $this->manager->describe($this->stream, 'existing');
             \assert($details instanceof PersistentSubscriptionDetails);
 
-            $this->assertEquals($this->stream, $details->eventStreamId());
-            $this->assertEquals('existing', $details->groupName());
-            $this->assertEquals(2, $details->totalItemsProcessed());
-            $this->assertEquals('Live', $details->status());
-            $this->assertEquals(1, $details->lastKnownEventNumber());
+            $this->assertSame($this->stream, $details->eventStreamId());
+            $this->assertSame('existing', $details->groupName());
+            $this->assertSame(2, $details->totalItemsProcessed());
+            $this->assertSame('Live', $details->status());
+            $this->assertSame(1, $details->lastKnownEventNumber());
         });
     }
 
@@ -198,7 +198,7 @@ public function can_list_persistent_subscriptions_for_stream(): Generator
             foreach ($list as $details) {
                 \assert($details instanceof PersistentSubscriptionDetails);
 
-                $this->assertEquals($this->stream, $details->eventStreamId());
+                $this->assertSame($this->stream, $details->eventStreamId());
 
                 if ($details->groupName() === 'existing') {
                     $found = true;
diff --git a/tests/UserManagement/creating_a_user.php b/tests/UserManagement/creating_a_user.php
index bea33e59..08ca27c5 100644
--- a/tests/UserManagement/creating_a_user.php
+++ b/tests/UserManagement/creating_a_user.php
@@ -97,25 +97,25 @@ public function creating_a_user_with_parameters_can_be_read(): Generator
 
         $this->assertSame($login, $user->loginName());
         $this->assertSame('ourofull', $user->fullName());
-        $this->assertEquals(['foo', 'bar'], $user->groups());
+        $this->assertSame(['foo', 'bar'], $user->groups());
         $this->assertCount(5, $user->links());
         $this->assertNull($user->dateLastUpdated());
         $this->assertFalse($user->disabled());
 
         $this->assertStringEndsWith('/users/' . $login . '/command/reset-password', $user->links()[0]->href());
-        $this->assertEquals('reset-password', $user->links()[0]->rel());
+        $this->assertSame('reset-password', $user->links()[0]->rel());
 
         $this->assertStringEndsWith('/users/' . $login . '/command/change-password', $user->links()[1]->href());
-        $this->assertEquals('change-password', $user->links()[1]->rel());
+        $this->assertSame('change-password', $user->links()[1]->rel());
 
         $this->assertStringEndsWith('/users/' . $login, $user->links()[2]->href());
-        $this->assertEquals('edit', $user->links()[2]->rel());
+        $this->assertSame('edit', $user->links()[2]->rel());
 
         $this->assertStringEndsWith('/users/' . $login, $user->links()[3]->href());
-        $this->assertEquals('delete', $user->links()[3]->rel());
+        $this->assertSame('delete', $user->links()[3]->rel());
 
         $this->assertStringEndsWith('/users/' . $login . '/command/disable', $user->links()[4]->href());
-        $this->assertEquals('disable', $user->links()[4]->rel());
+        $this->assertSame('disable', $user->links()[4]->rel());
 
         $href = $user->getRelLink('disable');
         $this->assertStringEndsWith('/users/' . $login . '/command/disable', $href);
diff --git a/tests/UserManagement/updating_a_user.php b/tests/UserManagement/updating_a_user.php
index da9f6daf..5efd4cb2 100644
--- a/tests/UserManagement/updating_a_user.php
+++ b/tests/UserManagement/updating_a_user.php
@@ -68,6 +68,6 @@ public function updating_a_user_with_parameters_can_be_read(): Generator
 
         $this->assertSame($name, $user->loginName());
         $this->assertSame('something', $user->fullName());
-        $this->assertEquals(['bar', 'baz'], $user->groups());
+        $this->assertSame(['bar', 'baz'], $user->groups());
     }
 }
diff --git a/tests/append_to_stream.php b/tests/append_to_stream.php
index c80e5801..cfd952aa 100644
--- a/tests/append_to_stream.php
+++ b/tests/append_to_stream.php
@@ -66,9 +66,9 @@ public function should_allow_appending_zero_events_to_stream_with_no_problems():
         $slice = yield $this->connection->readStreamEventsForwardAsync($stream1, 0, 2, false);
         \assert($slice instanceof StreamEventsSlice);
         $this->assertCount(0, $slice->events());
-        $this->assertEquals($stream1, $slice->stream());
-        $this->assertEquals(0, $slice->fromEventNumber());
-        $this->assertEquals($slice->readDirection()->name(), ReadDirection::forward()->name());
+        $this->assertSame($stream1, $slice->stream());
+        $this->assertSame(0, $slice->fromEventNumber());
+        $this->assertSame($slice->readDirection()->name(), ReadDirection::forward()->name());
 
         $result = yield $this->connection->appendToStreamAsync($stream2, ExpectedVersion::NO_STREAM, []);
         $this->assertSame(-1, $result->nextExpectedVersion());
@@ -450,7 +450,7 @@ public function writes_predefined_event_id(): Generator
 
         $this->connection->close();
 
-        $this->assertEquals($event->eventId()->toString(), $readEvent->eventId()->toString());
+        $this->assertSame($event->eventId()->toString(), $readEvent->eventId()->toString());
 
         $url = \sprintf(
             'http://%s:%s/streams/%s/head/backward/1?embed=body',
@@ -485,6 +485,6 @@ public function writes_predefined_event_id(): Generator
 
         $eventId = $json['entries'][0]['eventId'];
 
-        $this->assertEquals($event->eventId()->toString(), $eventId);
+        $this->assertSame($event->eventId()->toString(), $eventId);
     }
 }
diff --git a/tests/connect.php b/tests/connect.php
index 0dc984dd..68198dc8 100644
--- a/tests/connect.php
+++ b/tests/connect.php
@@ -109,7 +109,7 @@ public function should_close_connection_after_configured_amount_of_failed_reconn
 
         $connection->onClosed(function (ClientClosedEventArgs $args) use ($closed): void {
             $this->assertInstanceOf(EventStoreConnection::class, $args->connection());
-            $this->assertEquals('Reconnection limit reached', $args->reason());
+            $this->assertSame('Reconnection limit reached', $args->reason());
 
             $closed->resolve(true);
         });
diff --git a/tests/connection_string.php b/tests/connection_string.php
index 512a57ee..53e7522b 100644
--- a/tests/connection_string.php
+++ b/tests/connection_string.php
@@ -22,7 +22,7 @@ class connection_string extends TestCase
     public function can_set_string_value(): void
     {
         $settings = ConnectionString::getConnectionSettings('targethost=testtest');
-        $this->assertEquals('testtest', $settings->targetHost());
+        $this->assertSame('testtest', $settings->targetHost());
     }
 
     /** @test */
@@ -72,7 +72,7 @@ public function can_set_gossip_seeds(): void
     public function can_set_user_credentials(): void
     {
         $settings = ConnectionString::getConnectionSettings('DefaultUserCredentials=foo:bar');
-        $this->assertEquals('foo', $settings->defaultUserCredentials()->username());
-        $this->assertEquals('bar', $settings->defaultUserCredentials()->password());
+        $this->assertSame('foo', $settings->defaultUserCredentials()->username());
+        $this->assertSame('bar', $settings->defaultUserCredentials()->password());
     }
 }
diff --git a/tests/transaction.php b/tests/transaction.php
index d8bbe903..0c7e5c1b 100644
--- a/tests/transaction.php
+++ b/tests/transaction.php
@@ -302,7 +302,7 @@ public function idempotency_is_correct_for_explicit_transactions_with_expected_v
         yield $transaction1->writeAsync([$event]);
         $result1 = yield $transaction1->commitAsync();
         \assert($result1 instanceof WriteResult);
-        $this->assertEquals(0, $result1->nextExpectedVersion());
+        $this->assertSame(0, $result1->nextExpectedVersion());
 
         $transaction2 = yield $this->connection->startTransactionAsync(
             $stream,
@@ -312,7 +312,7 @@ public function idempotency_is_correct_for_explicit_transactions_with_expected_v
         yield $transaction2->writeAsync([$event]);
         $result2 = yield $transaction2->commitAsync();
         \assert($result2 instanceof WriteResult);
-        $this->assertEquals(0, $result2->nextExpectedVersion());
+        $this->assertSame(0, $result2->nextExpectedVersion());
 
         $result = yield $this->connection->readStreamEventsForwardAsync(
             $stream,
diff --git a/tests/when_a_projection_is_running.php b/tests/when_a_projection_is_running.php
index 8f06a9f9..c0f72323 100644
--- a/tests/when_a_projection_is_running.php
+++ b/tests/when_a_projection_is_running.php
@@ -89,7 +89,7 @@ public function should_be_able_to_get_the_projection_result(): Generator
                 $this->credentials
             );
 
-            $this->assertEquals('{"count":1}', $result);
+            $this->assertSame('{"count":1}', $result);
         });
     }
 
diff --git a/tests/when_updating_a_projection_query.php b/tests/when_updating_a_projection_query.php
index 1171a822..25695d8c 100644
--- a/tests/when_updating_a_projection_query.php
+++ b/tests/when_updating_a_projection_query.php
@@ -66,7 +66,7 @@ public function should_update_the_projection_query(): Generator
                 $this->credentials
             );
 
-            $this->assertEquals($this->newQuery, $query);
+            $this->assertSame($this->newQuery, $query);
         });
     }
 }
diff --git a/tests/when_working_with_raw_stream_metadata.php b/tests/when_working_with_raw_stream_metadata.php
index 294d2c64..5c722cc6 100644
--- a/tests/when_working_with_raw_stream_metadata.php
+++ b/tests/when_working_with_raw_stream_metadata.php
@@ -43,10 +43,10 @@ public function setting_empty_metadata_works(): Generator
 
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
     }
 
     /**
@@ -61,10 +61,10 @@ public function setting_metadata_few_times_returns_last_metadata(): Generator
 
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
 
         yield $this->connection->setStreamMetadataAsync(
             $this->stream,
@@ -104,10 +104,10 @@ public function setting_metadata_with_expected_version_any_works(): Generator
 
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
 
         yield $this->connection->setStreamMetadataAsync(
             $this->stream,
@@ -116,10 +116,10 @@ public function setting_metadata_with_expected_version_any_works(): Generator
 
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(1, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(1, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
     }
 
     /**
@@ -134,10 +134,10 @@ public function setting_metadata_for_not_existing_stream_works(): Generator
 
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
     }
 
     /**
@@ -158,10 +158,10 @@ public function setting_metadata_for_existing_stream_works(): Generator
 
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
     }
 
     /**
@@ -190,10 +190,10 @@ public function getting_metadata_for_nonexisting_stream_returns_empty_string():
     {
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(-1, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(-1, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
     }
 
     /**
@@ -207,9 +207,9 @@ public function getting_metadata_for_deleted_stream_returns_empty_string_and_sig
 
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertTrue($meta->isStreamDeleted());
-        $this->assertEquals(EventNumber::DELETED_STREAM, $meta->metastreamVersion());
-        $this->assertEquals('', $meta->streamMetadata());
+        $this->assertSame(EventNumber::DELETED_STREAM, $meta->metastreamVersion());
+        $this->assertSame('', $meta->streamMetadata());
     }
 }
diff --git a/tests/when_working_with_stream_metadata_as_structured_info.php b/tests/when_working_with_stream_metadata_as_structured_info.php
index 3e041779..59a16ff1 100644
--- a/tests/when_working_with_stream_metadata_as_structured_info.php
+++ b/tests/when_working_with_stream_metadata_as_structured_info.php
@@ -48,10 +48,10 @@ public function setting_empty_metadata_works(): Generator
         $meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
         \assert($meta instanceof RawStreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals('{}', $meta->streamMetadata());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame('{}', $meta->streamMetadata());
     }
 
     /**
@@ -70,14 +70,14 @@ public function setting_metadata_few_times_returns_last_metadata_info(): Generat
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
+        $this->assertSame(0, $meta->metastreamVersion());
         $this->assertEmpty($meta->streamMetadata()->customMetadata());
-        $this->assertEquals($metadata->maxCount(), $meta->streamMetadata()->maxCount());
-        $this->assertEquals($metadata->maxAge(), $meta->streamMetadata()->maxAge());
-        $this->assertEquals($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
+        $this->assertSame($metadata->maxCount(), $meta->streamMetadata()->maxCount());
+        $this->assertSame($metadata->maxAge(), $meta->streamMetadata()->maxAge());
+        $this->assertSame($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
+        $this->assertSame($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
 
         $metadata = new StreamMetadata(37, 0xBEEFDEAD, 24, 0xDABACABAD);
 
@@ -90,13 +90,13 @@ public function setting_metadata_few_times_returns_last_metadata_info(): Generat
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(1, $meta->metastreamVersion());
-        $this->assertEquals($metadata->maxCount(), $meta->streamMetadata()->maxCount());
-        $this->assertEquals($metadata->maxAge(), $meta->streamMetadata()->maxAge());
-        $this->assertEquals($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
+        $this->assertSame(1, $meta->metastreamVersion());
+        $this->assertSame($metadata->maxCount(), $meta->streamMetadata()->maxCount());
+        $this->assertSame($metadata->maxAge(), $meta->streamMetadata()->maxAge());
+        $this->assertSame($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
+        $this->assertSame($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
 
         $this->expectException(RuntimeException::class);
         $meta->streamMetadata()->getValue('unknown');
@@ -132,13 +132,13 @@ public function setting_metadata_with_expected_version_any_works(): Generator
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals($metadata->maxCount(), $meta->streamMetadata()->maxCount());
-        $this->assertEquals($metadata->maxAge(), $meta->streamMetadata()->maxAge());
-        $this->assertEquals($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame($metadata->maxCount(), $meta->streamMetadata()->maxCount());
+        $this->assertSame($metadata->maxAge(), $meta->streamMetadata()->maxAge());
+        $this->assertSame($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
+        $this->assertSame($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
 
         $metadata = new StreamMetadata(37, 0xBEEFDEAD, 24, 0xDABACABAD);
 
@@ -151,13 +151,13 @@ public function setting_metadata_with_expected_version_any_works(): Generator
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(1, $meta->metastreamVersion());
-        $this->assertEquals($metadata->maxCount(), $meta->streamMetadata()->maxCount());
-        $this->assertEquals($metadata->maxAge(), $meta->streamMetadata()->maxAge());
-        $this->assertEquals($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
+        $this->assertSame(1, $meta->metastreamVersion());
+        $this->assertSame($metadata->maxCount(), $meta->streamMetadata()->maxCount());
+        $this->assertSame($metadata->maxAge(), $meta->streamMetadata()->maxAge());
+        $this->assertSame($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
+        $this->assertSame($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
     }
 
     /**
@@ -176,13 +176,13 @@ public function setting_metadata_for_not_existing_stream_works(): Generator
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals($metadata->maxCount(), $meta->streamMetadata()->maxCount());
-        $this->assertEquals($metadata->maxAge(), $meta->streamMetadata()->maxAge());
-        $this->assertEquals($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame($metadata->maxCount(), $meta->streamMetadata()->maxCount());
+        $this->assertSame($metadata->maxAge(), $meta->streamMetadata()->maxAge());
+        $this->assertSame($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
+        $this->assertSame($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
     }
 
     /**
@@ -207,13 +207,13 @@ public function setting_metadata_for_existing_stream_works(): Generator
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals($metadata->maxCount(), $meta->streamMetadata()->maxCount());
-        $this->assertEquals($metadata->maxAge(), $meta->streamMetadata()->maxAge());
-        $this->assertEquals($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame($metadata->maxCount(), $meta->streamMetadata()->maxCount());
+        $this->assertSame($metadata->maxAge(), $meta->streamMetadata()->maxAge());
+        $this->assertSame($metadata->truncateBefore(), $meta->streamMetadata()->truncateBefore());
+        $this->assertSame($metadata->cacheControl(), $meta->streamMetadata()->cacheControl());
     }
 
     /**
@@ -224,9 +224,9 @@ public function getting_metadata_for_nonexisting_stream_returns_empty_stream_met
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(-1, $meta->metastreamVersion());
+        $this->assertSame(-1, $meta->metastreamVersion());
         $this->assertNull($meta->streamMetadata()->maxCount());
         $this->assertNull($meta->streamMetadata()->maxAge());
         $this->assertNull($meta->streamMetadata()->truncateBefore());
@@ -255,9 +255,9 @@ public function getting_metadata_for_deleted_stream_returns_empty_stream_metadat
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertTrue($meta->isStreamDeleted());
-        $this->assertEquals(EventNumber::DELETED_STREAM, $meta->metastreamVersion());
+        $this->assertSame(EventNumber::DELETED_STREAM, $meta->metastreamVersion());
         $this->assertNull($meta->streamMetadata()->maxCount());
         $this->assertNull($meta->streamMetadata()->maxAge());
         $this->assertNull($meta->streamMetadata()->truncateBefore());
@@ -303,30 +303,30 @@ public function setting_correctly_formatted_metadata_as_raw_allows_to_read_it_as
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals(17, $meta->streamMetadata()->maxCount());
-        $this->assertEquals(123321, $meta->streamMetadata()->maxAge());
-        $this->assertEquals(23, $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals(7654321, $meta->streamMetadata()->cacheControl());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame(17, $meta->streamMetadata()->maxCount());
+        $this->assertSame(123321, $meta->streamMetadata()->maxAge());
+        $this->assertSame(23, $meta->streamMetadata()->truncateBefore());
+        $this->assertSame(7654321, $meta->streamMetadata()->cacheControl());
 
         $this->assertNotNull($meta->streamMetadata()->acl());
-        $this->assertEquals('readRole', $meta->streamMetadata()->acl()->readRoles()[0]);
-        $this->assertEquals('writeRole', $meta->streamMetadata()->acl()->writeRoles()[0]);
-        $this->assertEquals('deleteRole', $meta->streamMetadata()->acl()->deleteRoles()[0]);
+        $this->assertSame('readRole', $meta->streamMetadata()->acl()->readRoles()[0]);
+        $this->assertSame('writeRole', $meta->streamMetadata()->acl()->writeRoles()[0]);
+        $this->assertSame('deleteRole', $meta->streamMetadata()->acl()->deleteRoles()[0]);
 
         // meta role removed to allow reading
-        // $this->assertEquals('metaReadRole', $meta->streamMetadata()->acl()->metaReadRoles()[0]);
-        $this->assertEquals('metaWriteRole', $meta->streamMetadata()->acl()->metaWriteRoles()[0]);
+        // $this->assertSame('metaReadRole', $meta->streamMetadata()->acl()->metaReadRoles()[0]);
+        $this->assertSame('metaWriteRole', $meta->streamMetadata()->acl()->metaWriteRoles()[0]);
 
-        $this->assertEquals('a string', $meta->streamMetadata()->getValue('customString'));
-        $this->assertEquals(-179, $meta->streamMetadata()->getValue('customInt'));
-        $this->assertEquals(1.7, $meta->streamMetadata()->getValue('customDouble'));
-        $this->assertEquals(123123123123123123, $meta->streamMetadata()->getValue('customLong'));
+        $this->assertSame('a string', $meta->streamMetadata()->getValue('customString'));
+        $this->assertSame(-179, $meta->streamMetadata()->getValue('customInt'));
+        $this->assertSame(1.7, $meta->streamMetadata()->getValue('customDouble'));
+        $this->assertSame(123123123123123123, $meta->streamMetadata()->getValue('customLong'));
         $this->assertTrue($meta->streamMetadata()->getValue('customBool'));
         $this->assertNull($meta->streamMetadata()->getValue('customNullable'));
-        $this->assertEquals(['subProperty' => 999], $meta->streamMetadata()->getValue('customRawJson'));
+        $this->assertSame(['subProperty' => 999], $meta->streamMetadata()->getValue('customRawJson'));
     }
 
     /**
@@ -362,30 +362,30 @@ public function setting_structured_metadata_with_custom_properties_returns_them_
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
-        $this->assertEquals(17, $meta->streamMetadata()->maxCount());
-        $this->assertEquals(123321, $meta->streamMetadata()->maxAge());
-        $this->assertEquals(23, $meta->streamMetadata()->truncateBefore());
-        $this->assertEquals(7654321, $meta->streamMetadata()->cacheControl());
+        $this->assertSame(0, $meta->metastreamVersion());
+        $this->assertSame(17, $meta->streamMetadata()->maxCount());
+        $this->assertSame(123321, $meta->streamMetadata()->maxAge());
+        $this->assertSame(23, $meta->streamMetadata()->truncateBefore());
+        $this->assertSame(7654321, $meta->streamMetadata()->cacheControl());
 
         $this->assertNotNull($meta->streamMetadata()->acl());
-        $this->assertEquals('readRole', $meta->streamMetadata()->acl()->readRoles()[0]);
-        $this->assertEquals('writeRole', $meta->streamMetadata()->acl()->writeRoles()[0]);
-        $this->assertEquals('deleteRole', $meta->streamMetadata()->acl()->deleteRoles()[0]);
+        $this->assertSame('readRole', $meta->streamMetadata()->acl()->readRoles()[0]);
+        $this->assertSame('writeRole', $meta->streamMetadata()->acl()->writeRoles()[0]);
+        $this->assertSame('deleteRole', $meta->streamMetadata()->acl()->deleteRoles()[0]);
 
         // meta role removed to allow reading
-        // $this->assertEquals('metaReadRole', $meta->streamMetadata()->acl()->metaReadRoles()[0]);
-        $this->assertEquals('metaWriteRole', $meta->streamMetadata()->acl()->metaWriteRoles()[0]);
+        // $this->assertSame('metaReadRole', $meta->streamMetadata()->acl()->metaReadRoles()[0]);
+        $this->assertSame('metaWriteRole', $meta->streamMetadata()->acl()->metaWriteRoles()[0]);
 
-        $this->assertEquals('a string', $meta->streamMetadata()->getValue('customString'));
-        $this->assertEquals(-179, $meta->streamMetadata()->getValue('customInt'));
-        $this->assertEquals(1.7, $meta->streamMetadata()->getValue('customDouble'));
-        $this->assertEquals(123123123123123123, $meta->streamMetadata()->getValue('customLong'));
+        $this->assertSame('a string', $meta->streamMetadata()->getValue('customString'));
+        $this->assertSame(-179, $meta->streamMetadata()->getValue('customInt'));
+        $this->assertSame(1.7, $meta->streamMetadata()->getValue('customDouble'));
+        $this->assertSame(123123123123123123, $meta->streamMetadata()->getValue('customLong'));
         $this->assertTrue($meta->streamMetadata()->getValue('customBool'));
         $this->assertNull($meta->streamMetadata()->getValue('customNullable'));
-        $this->assertEquals('{"subProperty": 999}', $meta->streamMetadata()->getValue('customRawJson'));
+        $this->assertSame('{"subProperty": 999}', $meta->streamMetadata()->getValue('customRawJson'));
     }
 
     /**
@@ -409,15 +409,15 @@ public function setting_structured_metadata_with_multiple_roles_can_be_read_back
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
+        $this->assertSame(0, $meta->metastreamVersion());
         $this->assertNotNull($meta->streamMetadata()->acl());
 
-        $this->assertEquals(['r1', 'r2', 'r3'], $meta->streamMetadata()->acl()->readRoles());
-        $this->assertEquals(['w1', 'w2'], $meta->streamMetadata()->acl()->writeRoles());
-        $this->assertEquals(['d1', 'd2', 'd3', 'd4'], $meta->streamMetadata()->acl()->deleteRoles());
-        $this->assertEquals(['mw1', 'mw2'], $meta->streamMetadata()->acl()->metaWriteRoles());
+        $this->assertSame(['r1', 'r2', 'r3'], $meta->streamMetadata()->acl()->readRoles());
+        $this->assertSame(['w1', 'w2'], $meta->streamMetadata()->acl()->writeRoles());
+        $this->assertSame(['d1', 'd2', 'd3', 'd4'], $meta->streamMetadata()->acl()->deleteRoles());
+        $this->assertSame(['mw1', 'mw2'], $meta->streamMetadata()->acl()->metaWriteRoles());
     }
 
     /**
@@ -445,14 +445,14 @@ public function setting_correct_metadata_with_multiple_roles_in_acl_allows_to_re
         $meta = yield $this->connection->getStreamMetadataAsync($this->stream);
         \assert($meta instanceof StreamMetadataResult);
 
-        $this->assertEquals($this->stream, $meta->stream());
+        $this->assertSame($this->stream, $meta->stream());
         $this->assertFalse($meta->isStreamDeleted());
-        $this->assertEquals(0, $meta->metastreamVersion());
+        $this->assertSame(0, $meta->metastreamVersion());
         $this->assertNotNull($meta->streamMetadata()->acl());
 
-        $this->assertEquals(['r1', 'r2', 'r3'], $meta->streamMetadata()->acl()->readRoles());
-        $this->assertEquals(['w1', 'w2'], $meta->streamMetadata()->acl()->writeRoles());
-        $this->assertEquals(['d1', 'd2', 'd3', 'd4'], $meta->streamMetadata()->acl()->deleteRoles());
-        $this->assertEquals(['mw1', 'mw2'], $meta->streamMetadata()->acl()->metaWriteRoles());
+        $this->assertSame(['r1', 'r2', 'r3'], $meta->streamMetadata()->acl()->readRoles());
+        $this->assertSame(['w1', 'w2'], $meta->streamMetadata()->acl()->writeRoles());
+        $this->assertSame(['d1', 'd2', 'd3', 'd4'], $meta->streamMetadata()->acl()->deleteRoles());
+        $this->assertSame(['mw1', 'mw2'], $meta->streamMetadata()->acl()->metaWriteRoles());
     }
 }