diff --git a/.gitignore b/.gitignore
index 7c39b07..5cf5e7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,7 @@
 /php-nikic-php-parser4-4.1.0-d0230c5.tar.gz
 /php-nikic-php-parser4-4.1.1-8aae5b5.tar.gz
 /php-nikic-php-parser4-4.2.0-594bcae.tar.gz
+/php-nikic-php-parser4-4.2.1-5221f49.tar.gz
+/php-nikic-php-parser4-4.2.2-1bd73cc.tar.gz
+/php-nikic-php-parser4-4.2.3-e612609.tar.gz
+/php-nikic-php-parser4-4.2.4-97e59c7.tar.gz
diff --git a/php-nikic-php-parser4-rpm.patch b/php-nikic-php-parser4-rpm.patch
index bbdfc8f..66edc42 100644
--- a/php-nikic-php-parser4-rpm.patch
+++ b/php-nikic-php-parser4-rpm.patch
@@ -15,15 +15,4 @@ diff -up ./bin/php-parse.rpm ./bin/php-parse
  
  ini_set('xdebug.max_nesting_level', 3000);
  
-diff -up ./test/bootstrap.php.rpm ./test/bootstrap.php
---- ./test/bootstrap.php.rpm	2016-04-20 06:33:22.713063604 +0200
-+++ ./test/bootstrap.php	2016-04-20 06:34:38.963385593 +0200
-@@ -2,7 +2,7 @@
- 
- namespace PhpParser;
- 
--require __DIR__ . '/../vendor/autoload.php';
-+require '@BUILDROOT@/usr/share/php/PhpParser4/autoload.php';
- 
- function canonicalize($str) {
-     // normalize EOL style
+
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 4ca79c8..03d2ffa 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    594bcae1fc0bccd3993d2f0d61a018e26ac2865a
+%global gh_commit    97e59c7a16464196a8b9c77c47df68e4a39a45c4
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nikic
 %global gh_project   PHP-Parser
@@ -21,7 +21,7 @@
 %global major        4
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
-Version:        4.2.0
+Version:        4.2.4
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -43,9 +43,9 @@ BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.5 || ^7.0"
-%global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7
+#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+%global phpunit %{_bindir}/phpunit8
+BuildRequires:  phpunit8
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
@@ -113,14 +113,21 @@ sed -e 's:%{php_home}:%{buildroot}%{php_home}:' \
 php bin/php-parse-test --help
 
 : Test suite autoloader
-sed -e 's:@BUILDROOT@:%{buildroot}:' -i test/bootstrap.php
+mkdir vendor
+cat << 'AUTOLOAD' | tee vendor/autoload.php
+<?php
+require_once '%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', dirname(__DIR__).'/test/PhpParser/');
+AUTOLOAD
 
 : Upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do
+for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
+    $1 ${2:-%{_bindir}/phpunit8} \
+      --filter '^((?!(testParse|testLexNewFeatures)).)*$' \
+      --verbose || ret=1
   fi
 done
 exit $ret
@@ -138,6 +145,19 @@ exit $ret
 
 
 %changelog
+* Mon Sep  2 2019 Remi Collet <remi@remirepo.net> - 4.2.4-1
+- update to 4.2.4
+
+* Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 4.2.3-1
+- update to 4.2.3
+- use phpunit8
+
+* Mon May 27 2019 Remi Collet <remi@remirepo.net> - 4.2.2-1
+- update to 4.2.2
+
+* Mon Feb 18 2019 Remi Collet <remi@remirepo.net> - 4.2.1-1
+- update to 4.2.1
+
 * Sun Jan 13 2019 Remi Collet <remi@remirepo.net> - 4.2.0-1
 - update to 4.2.0
 
diff --git a/sources b/sources
index 0892e90..22cd820 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.2.0-594bcae.tar.gz) = 093a5dc47d71e248f33c93363cd0a5e45fdd28c11c234f8bb54045beb666a2bb916b6c7cef27937258948158d517ee84971f26821957cfcfbc94a183266405b7
+SHA512 (php-nikic-php-parser4-4.2.4-97e59c7.tar.gz) = 5feedb3a891146729901e89d2e088f2a90007e21f6845a95d4a773d77c5db575eb93b2bc7424de2f862b91a113b6086334981b1c9e4ed039d366e74d0bc08c68