diff --git a/.travis.yml b/.travis.yml
index 65871e5a..c41badbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,13 @@ branches:
 matrix:
     fast_finish: true
     include:
+        - php: 7.3
+        - php: 7.2
         - php: 7.1
         - php: 7.0
         - php: 5.6
         - php: 5.5
-        - 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 e47a16e3..e9a77f8e 100644
--- a/composer.json
+++ b/composer.json
@@ -28,8 +28,8 @@
         "gpslab/cqrs": "~1.0"
     },
     "require-dev": {
-        "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/ObviousSpecificationQueryTest.php b/tests/ObviousSpecificationQueryTest.php
index 3f7be73d..d6c8bb19 100644
--- a/tests/ObviousSpecificationQueryTest.php
+++ b/tests/ObviousSpecificationQueryTest.php
@@ -11,8 +11,9 @@
 namespace GpsLab\Component\Query\Specification;
 
 use Happyr\DoctrineSpecification\Spec;
+use PHPUnit\Framework\TestCase;
 
-class ObviousSpecificationQueryTest extends \PHPUnit_Framework_TestCase
+class ObviousSpecificationQueryTest extends TestCase
 {
     public function testHasModifier()
     {
diff --git a/tests/SpecificationQueryHandlerTest.php b/tests/SpecificationQueryHandlerTest.php
index 54469228..09783928 100644
--- a/tests/SpecificationQueryHandlerTest.php
+++ b/tests/SpecificationQueryHandlerTest.php
@@ -13,8 +13,9 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Happyr\DoctrineSpecification\EntitySpecificationRepositoryInterface;
 use Happyr\DoctrineSpecification\Spec;
+use PHPUnit\Framework\TestCase;
 
-class SpecificationQueryHandlerTest extends \PHPUnit_Framework_TestCase
+class SpecificationQueryHandlerTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|EntityManagerInterface