diff --git a/.gitignore b/.gitignore
index 685577b..0732207 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+clog
 /php-phpunit-php-file-iterator2-2.0.0-e20525b.tar.gz
 /php-phpunit-php-file-iterator2-2.0.1-cecbc68.tar.gz
 /php-phpunit-php-file-iterator2-2.0.2-050bedf.tar.gz
+/php-phpunit-php-file-iterator2-2.0.3-4b49fb7.tar.gz
+/php-phpunit-php-file-iterator2-2.0.4-28af674.tar.gz
diff --git a/php-phpunit-php-file-iterator2.spec b/php-phpunit-php-file-iterator2.spec
index 2fb87fa..9018123 100644
--- a/php-phpunit-php-file-iterator2.spec
+++ b/php-phpunit-php-file-iterator2.spec
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    050bedf145a257b1ff02746c31894800e5122946
+%global gh_commit    28af674ff175d0768a5a978e6de83f697d4a7f05
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-file-iterator
@@ -28,8 +28,8 @@
 
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.0.2
-Release:        5%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        FilterIterator implementation that filters files based on a list of suffixes
 
 License:        BSD
@@ -39,9 +39,9 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 BuildArch:      noarch
 %if %{with_tests}
 # From composer.json, "require-dev"
-#        "phpunit/phpunit": "^7.1"
-BuildRequires:  phpunit7 >= 7.1
-BuildRequires:  php(language) >= 7.1
+#        "phpunit/phpunit": "^8.5"
+BuildRequires:  phpunit8 >= 8.5
+BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 %endif
@@ -86,10 +86,10 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72; do
+for cmd in php php73 php74 php80 php81; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-      %{_bindir}/phpunit7  --verbose || ret=1
+      %{_bindir}/phpunit8  --verbose || ret=1
   fi
 done
 exit $ret
@@ -106,6 +106,10 @@ exit $ret
 
 
 %changelog
+* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 2.0.4-1
+- update to 2.0.4
+- switch to phpunit8
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 850875f..39bd19d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-file-iterator2-2.0.2-050bedf.tar.gz) = df4cb4d2c06ce03095b042b669b1c26c4a3075c04105e3f9b8ef6a5f7887f07c661261fba2c66064e62da56d669ab48e514f555f5261d272b150c75f3f468f59
+SHA512 (php-phpunit-php-file-iterator2-2.0.4-28af674.tar.gz) = e52a27df67c274885534a5651e07401dd42b6248b4ed3fd7fa41804c056f134a97525cfe447ae0b6637a875be801f74748a64e831cab9b3229167ad4c6f19e25