diff --git a/.travis.yml b/.travis.yml
index 48a175e..f0fe0a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,26 +12,30 @@ branches:
 matrix:
     fast_finish: true
     include:
+        - php: 7.3
+        - php: 7.2
         - php: 7.1
         - php: 7.0
         - php: 5.6
         - php: 5.5
+          dist: trusty
         - php: 5.5
+          dist: trusty
           env: SYMFONY_VERSION=2.7.*
         - php: 5.5
+          dist: trusty
           env: SYMFONY_VERSION=2.8.*
         - php: 5.5
+          dist: trusty
           env: SYMFONY_VERSION=3.0.*
         - php: 5.5
+          dist: trusty
           env: PREDIS_VERSION=1.0.*
         - php: 5.5
+          dist: trusty
           env: PREDIS_VERSION=1.1.*
         - php: 5.6
           env: PUBSUB_PREDIS_VERSION=2.0.*
-        - php: hhvm
-          sudo: required
-          dist: trusty
-          group: edge
 
 before_install:
     - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then echo 'xdebug.enable = on' >> /etc/hhvm/php.ini; fi
diff --git a/composer.json b/composer.json
index ae43414..b93fb89 100644
--- a/composer.json
+++ b/composer.json
@@ -31,8 +31,8 @@
         "symfony/dependency-injection": "~2.3|~3.0",
         "symfony/serializer": "~2.3|~3.0",
         "predis/predis": "~1.0|~1.1",
-        "phpunit/phpunit": "~4.8",
+        "phpunit/phpunit": "^4.8.36",
         "scrutinizer/ocular": "~1.3",
-        "satooshi/php-coveralls": "^1.0"
+        "php-coveralls/php-coveralls": "^1.0"
     }
 }
diff --git a/tests/Command/Bus/HandlerLocatedCommandBusTest.php b/tests/Command/Bus/HandlerLocatedCommandBusTest.php
index 585684d..6b2ab14 100644
--- a/tests/Command/Bus/HandlerLocatedCommandBusTest.php
+++ b/tests/Command/Bus/HandlerLocatedCommandBusTest.php
@@ -13,8 +13,9 @@
 use GpsLab\Component\Command\Bus\HandlerLocatedCommandBus;
 use GpsLab\Component\Command\Command;
 use GpsLab\Component\Command\Handler\Locator\CommandHandlerLocator;
+use PHPUnit\Framework\TestCase;
 
-class HandlerLocatedCommandBusTest extends \PHPUnit_Framework_TestCase
+class HandlerLocatedCommandBusTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|CommandHandlerLocator
diff --git a/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php
index f8d5a05..d8337cb 100644
--- a/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php
+++ b/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php
@@ -15,8 +15,9 @@
 use GpsLab\Component\Tests\Fixture\Command\CreateContact;
 use GpsLab\Component\Tests\Fixture\Command\Handler\CreateContactHandler;
 use Psr\Container\ContainerInterface;
+use PHPUnit\Framework\TestCase;
 
-class ContainerCommandHandlerLocatorTest extends \PHPUnit_Framework_TestCase
+class ContainerCommandHandlerLocatorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|ContainerInterface
diff --git a/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php
index 884a7ea..62e20ac 100644
--- a/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php
+++ b/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php
@@ -12,8 +12,9 @@
 
 use GpsLab\Component\Command\Handler\Locator\DirectBindingCommandHandlerLocator;
 use GpsLab\Component\Command\Command;
+use PHPUnit\Framework\TestCase;
 
-class DirectBindingCommandHandlerLocatorTest extends \PHPUnit_Framework_TestCase
+class DirectBindingCommandHandlerLocatorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Command
diff --git a/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php
index ed3a7a3..970c120 100644
--- a/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php
+++ b/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php
@@ -15,8 +15,9 @@
 use GpsLab\Component\Tests\Fixture\Command\Handler\RenameContactHandler;
 use GpsLab\Component\Tests\Fixture\Command\RenameContactCommand;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use PHPUnit\Framework\TestCase;
 
-class SymfonyContainerCommandHandlerLocatorTest extends \PHPUnit_Framework_TestCase
+class SymfonyContainerCommandHandlerLocatorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|ContainerInterface
diff --git a/tests/Command/Queue/Pull/MemoryPullCommandQueueTest.php b/tests/Command/Queue/Pull/MemoryPullCommandQueueTest.php
index e805d09..5a3561a 100644
--- a/tests/Command/Queue/Pull/MemoryPullCommandQueueTest.php
+++ b/tests/Command/Queue/Pull/MemoryPullCommandQueueTest.php
@@ -13,8 +13,9 @@
 use GpsLab\Component\Command\Queue\Pull\MemoryPullCommandQueue;
 use GpsLab\Component\Tests\Fixture\Command\CreateContact;
 use GpsLab\Component\Tests\Fixture\Command\RenameContactCommand;
+use PHPUnit\Framework\TestCase;
 
-class MemoryPullCommandQueueTest extends \PHPUnit_Framework_TestCase
+class MemoryPullCommandQueueTest extends TestCase
 {
     /**
      * @var MemoryPullCommandQueue
diff --git a/tests/Command/Queue/Pull/MemoryUniquePullCommandQueueTest.php b/tests/Command/Queue/Pull/MemoryUniquePullCommandQueueTest.php
index 2107428..9251c29 100644
--- a/tests/Command/Queue/Pull/MemoryUniquePullCommandQueueTest.php
+++ b/tests/Command/Queue/Pull/MemoryUniquePullCommandQueueTest.php
@@ -13,8 +13,9 @@
 use GpsLab\Component\Command\Queue\Pull\MemoryUniquePullCommandQueue;
 use GpsLab\Component\Tests\Fixture\Command\CreateContact;
 use GpsLab\Component\Tests\Fixture\Command\RenameContactCommand;
+use PHPUnit\Framework\TestCase;
 
-class MemoryUniquePullCommandQueueTest extends \PHPUnit_Framework_TestCase
+class MemoryUniquePullCommandQueueTest extends TestCase
 {
     /**
      * @var MemoryUniquePullCommandQueue
diff --git a/tests/Command/Queue/Pull/PredisPullCommandQueueTest.php b/tests/Command/Queue/Pull/PredisPullCommandQueueTest.php
index a809f63..7c0c32b 100644
--- a/tests/Command/Queue/Pull/PredisPullCommandQueueTest.php
+++ b/tests/Command/Queue/Pull/PredisPullCommandQueueTest.php
@@ -16,8 +16,9 @@
 use GpsLab\Component\Tests\Fixture\Command\RenameContactCommand;
 use Predis\Client;
 use Psr\Log\LoggerInterface;
+use PHPUnit\Framework\TestCase;
 
-class PredisPullCommandQueueTest extends \PHPUnit_Framework_TestCase
+class PredisPullCommandQueueTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Client
diff --git a/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php b/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php
index 13d4002..68b4c1c 100644
--- a/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php
+++ b/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php
@@ -16,8 +16,9 @@
 use GpsLab\Component\Tests\Fixture\Command\RenameContactCommand;
 use Predis\Client;
 use Psr\Log\LoggerInterface;
+use PHPUnit\Framework\TestCase;
 
-class PredisUniquePullCommandQueueTest extends \PHPUnit_Framework_TestCase
+class PredisUniquePullCommandQueueTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Client
diff --git a/tests/Command/Queue/Serializer/SymfonySerializerTest.php b/tests/Command/Queue/Serializer/SymfonySerializerTest.php
index 983c09d..cc4d3ac 100644
--- a/tests/Command/Queue/Serializer/SymfonySerializerTest.php
+++ b/tests/Command/Queue/Serializer/SymfonySerializerTest.php
@@ -13,8 +13,9 @@
 use GpsLab\Component\Command\Command;
 use GpsLab\Component\Command\Queue\Serializer\SymfonySerializer;
 use Symfony\Component\Serializer\SerializerInterface;
+use PHPUnit\Framework\TestCase;
 
-class SymfonySerializerTest extends \PHPUnit_Framework_TestCase
+class SymfonySerializerTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|SerializerInterface
diff --git a/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php b/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php
index 5784c64..1150501 100644
--- a/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php
+++ b/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php
@@ -12,8 +12,9 @@
 
 use GpsLab\Component\Command\Command;
 use GpsLab\Component\Command\Queue\Subscribe\ExecutingSubscribeCommandQueue;
+use PHPUnit\Framework\TestCase;
 
-class ExecutingSubscribeCommandQueueTest extends \PHPUnit_Framework_TestCase
+class ExecutingSubscribeCommandQueueTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Command
diff --git a/tests/Command/Queue/Subscribe/PredisSubscribeCommandQueueTest.php b/tests/Command/Queue/Subscribe/PredisSubscribeCommandQueueTest.php
index 04bc448..4c1292e 100644
--- a/tests/Command/Queue/Subscribe/PredisSubscribeCommandQueueTest.php
+++ b/tests/Command/Queue/Subscribe/PredisSubscribeCommandQueueTest.php
@@ -15,8 +15,9 @@
 use GpsLab\Component\Command\Queue\Subscribe\PredisSubscribeCommandQueue;
 use Psr\Log\LoggerInterface;
 use Superbalist\PubSub\Redis\RedisPubSubAdapter;
+use PHPUnit\Framework\TestCase;
 
-class PredisSubscribeCommandQueueTest extends \PHPUnit_Framework_TestCase
+class PredisSubscribeCommandQueueTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Command
@@ -181,6 +182,7 @@ public function testSubscribeHandlerFailure()
         $handler = function ($command) use ($exception) {
             $this->assertInstanceOf(Command::class, $command);
             $this->assertEquals($this->command, $command);
+
             throw $exception;
         };
 
diff --git a/tests/Query/Bus/HandlerLocatedQueryBusTest.php b/tests/Query/Bus/HandlerLocatedQueryBusTest.php
index 1eae183..27b63a7 100644
--- a/tests/Query/Bus/HandlerLocatedQueryBusTest.php
+++ b/tests/Query/Bus/HandlerLocatedQueryBusTest.php
@@ -13,8 +13,9 @@
 use GpsLab\Component\Query\Bus\HandlerLocatedQueryBus;
 use GpsLab\Component\Query\Query;
 use GpsLab\Component\Query\Handler\Locator\QueryHandlerLocator;
+use PHPUnit\Framework\TestCase;
 
-class HandlerLocatedQueryBusTest extends \PHPUnit_Framework_TestCase
+class HandlerLocatedQueryBusTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|QueryHandlerLocator
diff --git a/tests/Query/Handler/Locator/ContainerQueryHandlerLocatorTest.php b/tests/Query/Handler/Locator/ContainerQueryHandlerLocatorTest.php
index 8970688..931a803 100644
--- a/tests/Query/Handler/Locator/ContainerQueryHandlerLocatorTest.php
+++ b/tests/Query/Handler/Locator/ContainerQueryHandlerLocatorTest.php
@@ -15,8 +15,9 @@
 use GpsLab\Component\Tests\Fixture\Query\ContactByIdentity;
 use GpsLab\Component\Tests\Fixture\Query\Handler\ContactByIdentityHandler;
 use Psr\Container\ContainerInterface;
+use PHPUnit\Framework\TestCase;
 
-class ContainerQueryHandlerLocatorTest extends \PHPUnit_Framework_TestCase
+class ContainerQueryHandlerLocatorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|ContainerInterface
diff --git a/tests/Query/Handler/Locator/DirectBindingQueryHandlerLocatorTest.php b/tests/Query/Handler/Locator/DirectBindingQueryHandlerLocatorTest.php
index f27eee6..ed4a65e 100644
--- a/tests/Query/Handler/Locator/DirectBindingQueryHandlerLocatorTest.php
+++ b/tests/Query/Handler/Locator/DirectBindingQueryHandlerLocatorTest.php
@@ -12,8 +12,9 @@
 
 use GpsLab\Component\Query\Handler\Locator\DirectBindingQueryHandlerLocator;
 use GpsLab\Component\Query\Query;
+use PHPUnit\Framework\TestCase;
 
-class DirectBindingQueryHandlerLocatorTest extends \PHPUnit_Framework_TestCase
+class DirectBindingQueryHandlerLocatorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Query
diff --git a/tests/Query/Handler/Locator/SymfonyContainerQueryHandlerLocatorTest.php b/tests/Query/Handler/Locator/SymfonyContainerQueryHandlerLocatorTest.php
index f3d539e..c1cd309 100644
--- a/tests/Query/Handler/Locator/SymfonyContainerQueryHandlerLocatorTest.php
+++ b/tests/Query/Handler/Locator/SymfonyContainerQueryHandlerLocatorTest.php
@@ -15,8 +15,9 @@
 use GpsLab\Component\Tests\Fixture\Query\ContactByNameQuery;
 use GpsLab\Component\Tests\Fixture\Query\Handler\ContactByNameHandler;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use PHPUnit\Framework\TestCase;
 
-class SymfonyContainerQueryHandlerLocatorTest extends \PHPUnit_Framework_TestCase
+class SymfonyContainerQueryHandlerLocatorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|ContainerInterface