diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 9b33c78..a88ff4e 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -1,8 +1,8 @@
 #
 # Fedora spec file for php-patchwork-jsqueeze
 #
-# Copyright (c) 2016 Adam Williamson <awilliam@redhat.com>
-#                    Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2021 Adam Williamson <awilliam@redhat.com>
+#                         Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -21,18 +21,21 @@
 # "php": ">=5.3.0"
 %global php_min_ver 5.3.0
 
-# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+%if 0%{?fedora}
+%bcond_without tests
+%else
+%bcond_with    tests
+%endif
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        3%{?dist}
+Release:        22%{?dist}
 Summary:        Efficient JavaScript minification
 
-Group:          Development/Libraries
-License:        ASL 2.0 or GPLv2
+# Automatically converted from old format: ASL 2.0 or GPLv2 - review is highly recommended.
+License:        Apache-2.0 OR GPL-2.0-only
 URL:            https://github.com/%{github_owner}/%{github_name}
 
 # GitHub export does not include tests.
@@ -44,10 +47,10 @@ BuildArch:      noarch
 # Autoloader
 BuildRequires: %{_bindir}/phpab
 # Tests
-%if %{with_tests}
+%if %{with tests}
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit9
 ## phpcompatinfo (computed from version 2.0.5)
 BuildRequires: php-pcre
 %endif
@@ -90,16 +93,29 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %check
-%if %{with_tests}
-%{_bindir}/phpunit --verbose \
-    --bootstrap %{buildroot}%{phpdir}/Patchwork/autoload-jsqueeze.php
+%if %{with tests}
+: Create tests autoloader
+cat << 'EOF' | tee tests/bootstrap.php
+<?php
+require "%{buildroot}%{phpdir}/Patchwork/autoload-jsqueeze.php";
+class_alias("PHPUnit\\Framework\\TestCase", "PHPUnit_Framework_TestCase");
+EOF
+
+: Run upstream test suite
+ret=0
+for cmd in php php74 php80 php81
+do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit9 --verbose || ret=1
+  fi
+done
+exit $ret
 %else
 : Tests skipped
 %endif
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE.*
 %doc *.md
 %doc composer.json
@@ -109,6 +125,64 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Aug  7 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.5-20
+- convert license to SPDX
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Dec  8 2021 Remi Collet <remi@fedoraproject.org> - 2.0.5-12
+- disable test suite on EL
+- switch to phpunit9
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild