diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index d8cef7c..c895362 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -745,16 +745,6 @@ parameters:
 			count: 1
 			path: src/PubNub/Endpoints/Endpoint.php
 
-		-
-			message: "#^Variable \\$publishKey in empty\\(\\) always exists and is not falsy\\.$#"
-			count: 1
-			path: src/PubNub/Endpoints/Endpoint.php
-
-		-
-			message: "#^Variable \\$subscribeKey in empty\\(\\) always exists and is not falsy\\.$#"
-			count: 1
-			path: src/PubNub/Endpoints/Endpoint.php
-
 		-
 			message: "#^Method PubNub\\\\Endpoints\\\\FileSharing\\\\DeleteFile\\:\\:createResponse\\(\\) has parameter \\$result with no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/tests/Acceptance/CustomMessageType/CustomMessageTypeContext.php b/tests/Acceptance/CustomMessageType/CustomMessageTypeContext.php
index c19d838..1a8619d 100644
--- a/tests/Acceptance/CustomMessageType/CustomMessageTypeContext.php
+++ b/tests/Acceptance/CustomMessageType/CustomMessageTypeContext.php
@@ -90,7 +90,7 @@ public function iFetchMessageHistoryWithSetToForChannel(string $attribute, strin
     /**
      * @When I fetch message history with messageType for :channelName channel
      */
-    public function iFetchMessageHistoryWithMessagetypeForChannel($channelName)
+    public function iFetchMessageHistoryWithMessagetypeForChannel(string $channelName): void
     {
         $this->channelName = $channelName;
         $builder = $this->pubnub->fetchMessages()->channels($this->channelName)->includeMessageType(true);
@@ -104,7 +104,7 @@ public function iFetchMessageHistoryWithMessagetypeForChannel($channelName)
     /**
      * @When I fetch message history with customMessageType for :channelName channel
      */
-    public function iFetchMessageHistoryWithCustommessagetypeForChannel($channelName)
+    public function iFetchMessageHistoryWithCustommessagetypeForChannel(string $channelName): void
     {
         $this->channelName = $channelName;
         $builder = $this->pubnub->fetchMessages()->channels($this->channelName)->includeCustomMessageType(true);