diff --git a/dist-git.spec b/dist-git.spec
index b9bec9d..3229023 100644
--- a/dist-git.spec
+++ b/dist-git.spec
@@ -3,8 +3,8 @@
 %global installdir /var/lib/dist-git
 
 Name:           dist-git
-Version:        1.20
-Release:        2%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        Package source version control system
 
 # upload.cgi uses GPLv1
@@ -26,17 +26,18 @@ Requires:       git
 Requires:       git-daemon
 Requires:       mod_ssl
 Requires:       crudini
-%if 0%{?rhel} && 0%{?rhel} < 10
 Requires(pre):  shadow-utils
-%endif
 
 Requires:       python3-requests
 Recommends:     python3-grokmirror
 Suggests:       python3-fedmsg
 Suggests:       fedora-messaging
-
-BuildRequires:  python3-devel
+%if 0%{?rhel} == 8
+BuildRequires:  python3-nose
+%else
 BuildRequires:  python3-pytest
+%endif
+BuildRequires:  python3-parameterized
 BuildRequires:  python3-requests
 
 # this should be Requires but see https://bugzilla.redhat.com/show_bug.cgi?id=1833810
@@ -91,17 +92,24 @@ cd -
 
 
 %pre
-%if 0%{?rhel} && 0%{?rhel} < 10
 # ------------------------------------------------------------------------------
 # Users and Groups
 # ------------------------------------------------------------------------------
 getent group packager > /dev/null || \
     groupadd -r packager
 exit 0
-%endif
+
 
 %check
-%pytest -vv .
+%if 0%{?rhel} && 0%{?rhel} <= 8
+%if 0%{?rhel} < 8
+nosetests -v .
+%else
+nosetests-3 -v .
+%endif
+%else
+pytest -vv .
+%endif
 
 
 %install
@@ -123,8 +131,6 @@ cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
 cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/
 cp -a configs/systemd/*        %{buildroot}%{_unitdir}/
 
-install -m0644 -D configs/sysusers.d/dist-git.conf %{buildroot}%{_sysusersdir}/dist-git.conf
-
 # ------------------------------------------------------------------------------
 # /var/lib/ ...... dynamic persistent files
 # ------------------------------------------------------------------------------
@@ -241,7 +247,6 @@ fi
 %{_bindir}/remove_unused_sources
 %{_bindir}/setup_git_package
 
-%{_sysusersdir}/dist-git.conf
 
 %files selinux
 %doc selinux/*
@@ -249,16 +254,6 @@ fi
 
 
 %changelog
-* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Tue Jul 07 2026 Miroslav Suchý <msuchy@redhat.com> 1.20-1
-- Fix tests for Python 3.15: replace removed CGIHTTPRequestHandler
-
-* Fri Feb 13 2026 Pavel Raiskup <pavel@raiskup.cz> 1.19-1
-- Avoid using parameterized and nose
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
 * Fri Sep 27 2024 Pavel Raiskup <praiskup@redhat.com> 1.18-1
 - replace test on _selinux_policy_version by macro that does it all
 - handle situation when _selinux_policy_version is not defined
diff --git a/sources b/sources
index 02a6f8a..812f1eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dist-git-1.20.tar.gz) = f68aa733a2d0e0faa8973ced5260a1c5b0f6892c5ebfca977ac17ca3bfbda33225d866bb1c16abe761452d17594399a75815a49f5d941dd2e0c5404a69a1f3be
+SHA512 (dist-git-1.18.tar.gz) = f3c4caa189589d9211fe37703d9eee0b7f03705536d598a955280ef4477095eeb1323c96c550f0b2a951b74c99fcd51b496c47e291c8658192c097d8bae0872d