diff --git a/.travis.yml b/.travis.yml
index 459e8526..abb1cf2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,5 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-# - hhvm # requires legacy phpunit & ignore errors, see below
-
 # lock distro so new future defaults will not break the build
 dist: trusty
 
@@ -18,10 +7,18 @@ matrix:
   include:
     - php: 5.3
       dist: precise
-    - php: hhvm
-      install: composer require phpunit/phpunit:^5 --dev --no-interaction
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: hhvm-3.18
+      install: composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 sudo: false
 
diff --git a/tests/FunctionalResolverTest.php b/tests/FunctionalResolverTest.php
index d4d437cd..102274cf 100644
--- a/tests/FunctionalResolverTest.php
+++ b/tests/FunctionalResolverTest.php
@@ -150,6 +150,7 @@ public function testResolveShouldNotCauseGarbageReferencesWhenUsingInvalidNamese
         $this->resolver = $factory->create('255.255.255.255', $this->loop);
 
         gc_collect_cycles();
+        gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $promise = $this->resolver->resolve('google.com');
         unset($promise);
diff --git a/tests/Query/RetryExecutorTest.php b/tests/Query/RetryExecutorTest.php
index f15f64ca..67d57032 100644
--- a/tests/Query/RetryExecutorTest.php
+++ b/tests/Query/RetryExecutorTest.php
@@ -223,6 +223,8 @@ public function queryShouldNotCauseGarbageReferencesOnSuccess()
         $retryExecutor = new RetryExecutor($executor, 0);
 
         gc_collect_cycles();
+        gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
+
         $query = new Query('igor.io', Message::TYPE_A, Message::CLASS_IN);
         $retryExecutor->query($query);