diff --git a/.php_cs.dist b/.php_cs.dist
index 53d9a56..56ea334 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -12,6 +12,7 @@ return (new PhpCsFixer\Config())
         'php_unit_internal_class' => false,
         'php_unit_test_class_requires_covers' => false,
         'yoda_style' => true,
+        'php_unit_test_case_static_method_calls'=> ['call_type' => 'self'],
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
diff --git a/tests/NsqTest.php b/tests/NsqTest.php
index 7cf8c43..6eba15a 100644
--- a/tests/NsqTest.php
+++ b/tests/NsqTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Nsq\Message;
+use Nsq\Reader;
 use Nsq\Subscriber;
 use Nsq\Writer;
 use Nsq\Exception;
@@ -15,19 +16,19 @@ final class NsqTest extends TestCase
         $writer = new Writer('tcp://localhost:4150');
         $writer->pub(__FUNCTION__, __FUNCTION__);
 
-        $reader = new \Nsq\Reader('tcp://localhost:4150');
+        $reader = new Reader('tcp://localhost:4150');
         $subscriber = new Subscriber($reader);
         $generator = $subscriber->subscribe(__FUNCTION__, __FUNCTION__, 1);
 
         /** @var null|Message $envelope */
         $envelope = $generator->current();
 
-        static::assertInstanceOf(Message::class, $envelope);
-        static::assertSame(__FUNCTION__, $envelope->body);
+        self::assertInstanceOf(Message::class, $envelope);
+        self::assertSame(__FUNCTION__, $envelope->body);
         $envelope->finish();
 
         $generator->next();
-        static::assertNull($generator->current());
+        self::assertNull($generator->current());
 
         $writer->mpub(__FUNCTION__, [
             'First mpub message.',
@@ -37,22 +38,22 @@ final class NsqTest extends TestCase
         $generator->next();
         /** @var null|Message $envelope */
         $envelope = $generator->current();
-        static::assertInstanceOf(Message::class, $envelope);
-        static::assertSame('First mpub message.', $envelope->body);
+        self::assertInstanceOf(Message::class, $envelope);
+        self::assertSame('First mpub message.', $envelope->body);
         $envelope->finish();
 
         $generator->next();
         /** @var null|Message $envelope */
         $envelope = $generator->current();
-        static::assertInstanceOf(Message::class, $envelope);
-        static::assertSame('Second mpub message.', $envelope->body);
+        self::assertInstanceOf(Message::class, $envelope);
+        self::assertSame('Second mpub message.', $envelope->body);
         $envelope->requeue(0);
 
         $generator->next();
         /** @var null|Message $envelope */
         $envelope = $generator->current();
-        static::assertInstanceOf(Message::class, $envelope);
-        static::assertSame('Second mpub message.', $envelope->body);
+        self::assertInstanceOf(Message::class, $envelope);
+        self::assertSame('Second mpub message.', $envelope->body);
         $envelope->finish();
 
         $writer->dpub(__FUNCTION__, 2000, 'Deferred message.');
@@ -60,20 +61,20 @@ final class NsqTest extends TestCase
         $generator->next();
         /** @var null|Message $envelope */
         $envelope = $generator->current();
-        static::assertNull($envelope);
+        self::assertNull($envelope);
 
         $generator->send(Subscriber::CHANGE_TIMEOUT);
         $generator->send(10.0);
 
         /** @var null|Message $envelope */
         $envelope = $generator->current();
-        static::assertInstanceOf(Message::class, $envelope);
-        static::assertSame('Deferred message.', $envelope->body);
+        self::assertInstanceOf(Message::class, $envelope);
+        self::assertSame('Deferred message.', $envelope->body);
         $envelope->finish();
 
-        static::assertFalse($reader->isClosed());
+        self::assertFalse($reader->isClosed());
         $generator->send(Subscriber::STOP);
-        static::assertTrue($reader->isClosed());
+        self::assertTrue($reader->isClosed());
     }
 
     /**