diff --git a/.travis.yml b/.travis.yml
index af69a9a..fabfff5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,29 @@
 language: php
-
+dist: trusty
 sudo: false
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
+  - 7.2
+
+cache:
+  directories:
+    - ${HOME}/.composer/cache/files
 
 matrix:
-    fast_finish: true
-    allow_failures:
-        - php: hhvm
-        - env: SYMFONY_VERSION=3.0.*
+  fast_finish: true
+  include:
+    - php: 5.3
+      dist: precise
+      env: COMPOSER_FLAGS="--prefer-lowest"
 
-    include:
-        - php: 5.3
-          env: COMPOSER_FLAGS="--prefer-lowest"
+before_script:
+  - phpenv config-rm xdebug.ini
+  - composer update --no-interaction --no-progress --no-suggest ${COMPOSER_FLAGS}
 
-before_install:
-    - travis_retry composer self-update
-
-install:
-    - composer update ${COMPOSER_FLAGS} --no-interaction
+script:
+  - vendor/bin/phpunit -v
diff --git a/composer.json b/composer.json
index fe105cc..a7d42b9 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,10 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/event-dispatcher": "^2.3 || ^3.0"
+        "symfony/event-dispatcher": "^2.3 || ^3.0 || ^4.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8.36 || ^6.4"
     },
     "autoload": {
         "psr-0": { "Jmikola": "src/" }
diff --git a/tests/Jmikola/Tests/WildcardEventDispatcher/LazyListenerPatternTest.php b/tests/Jmikola/Tests/WildcardEventDispatcher/LazyListenerPatternTest.php
index 2895f12..f15ed6a 100644
--- a/tests/Jmikola/Tests/WildcardEventDispatcher/LazyListenerPatternTest.php
+++ b/tests/Jmikola/Tests/WildcardEventDispatcher/LazyListenerPatternTest.php
@@ -3,8 +3,9 @@
 namespace Jmikola\Tests\WildcardEventDispatcher;
 
 use Jmikola\WildcardEventDispatcher\LazyListenerPattern;
+use PHPUnit\Framework\TestCase;
 
-class LazyListenerPatternTest extends \PHPUnit_Framework_TestCase
+class LazyListenerPatternTest extends TestCase
 {
     /**
      * @expectedException InvalidArgumentException
diff --git a/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php b/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php
index 977ae58..28cc413 100644
--- a/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php
+++ b/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php
@@ -3,8 +3,9 @@
 namespace Jmikola\Tests\WildcardEventDispatcher;
 
 use Jmikola\WildcardEventDispatcher\ListenerPattern;
+use PHPUnit\Framework\TestCase;
 
-class ListenerPatternTest extends \PHPUnit_Framework_TestCase
+class ListenerPatternTest extends TestCase
 {
     /**
      * @dataProvider providePatternsAndMatches
diff --git a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php
index 54b26c1..ad00bf0 100644
--- a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php
+++ b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php
@@ -4,8 +4,9 @@ namespace Jmikola\Tests\WildcardEventDispatcher;
 
 use Jmikola\WildcardEventDispatcher\WildcardEventDispatcher;
 use Symfony\Component\EventDispatcher\Event;
+use PHPUnit\Framework\TestCase;
 
-class WildcardEventDispatcherFunctionalTest extends \PHPUnit_Framework_TestCase
+class WildcardEventDispatcherFunctionalTest extends TestCase
 {
     const coreRequest = 'core.request';
     const coreException = 'core.exception';
diff --git a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php
index 20353b4..f746787 100644
--- a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php
+++ b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php
@@ -4,8 +4,9 @@ namespace Jmikola\Tests\WildcardEventDispatcher;
 
 use Jmikola\WildcardEventDispatcher\WildcardEventDispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use PHPUnit\Framework\TestCase;
 
-class EventDispatcherTest extends \PHPUnit_Framework_TestCase
+class EventDispatcherTest extends TestCase
 {
     private $dispatcher;
     private $innerDispatcher;