diff --git a/systemd.spec b/systemd.spec
index 145b35b..5187e35 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1060,7 +1060,7 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
 # and https://src.fedoraproject.org/rpms/setup/pull-request/10.
 # We skip this on upstream builds so that new users and groups
 # can be added without breaking the build.
-%{python3} %{SOURCE4} /usr/lib/sysusers.d/20-setup-{users,groups}.conf %{buildroot}/usr/lib/sysusers.d/basic.conf
+%{python3} %{SOURCE4} /usr/lib/sysusers.d/setup.conf %{buildroot}/usr/lib/sysusers.d/basic.conf
 %endif
 rm %{buildroot}/usr/lib/sysusers.d/basic.conf
 %endif
diff --git a/test_sysusers_defined.py b/test_sysusers_defined.py
index 6f04f15..7ea2fea 100755
--- a/test_sysusers_defined.py
+++ b/test_sysusers_defined.py
@@ -22,11 +22,7 @@ def parse_sysusers_file(filename):
     return users, groups
 
 setup_users, setup_groups = parse_sysusers_file(sys.argv[1])
-setup_users2, setup_groups2 = parse_sysusers_file(sys.argv[2])
-setup_users |= setup_users2
-setup_groups |= setup_groups2
-
-basic_users, basic_groups = parse_sysusers_file(sys.argv[3])
+basic_users, basic_groups = parse_sysusers_file(sys.argv[2])
 
 if d := basic_users - setup_users:
     exit(f'We have new users: {d}')