diff --git a/python3.13.spec b/python3.13.spec
index fb6894c..b47b2ab 100644
--- a/python3.13.spec
+++ b/python3.13.spec
@@ -269,57 +269,44 @@ Obsoletes: python%{pybasever}%{?1:-%{1}}\
 # Build-time requirements
 # =======================
 
-# (keep this list alphabetized)
+# (keep this list alphabetized within the %%if blocks)
 
 BuildRequires: autoconf
 BuildRequires: bluez-libs-devel
 BuildRequires: bzip2-devel
-%if %{with main_python}
-BuildRequires: desktop-file-utils
-%endif
 # See the runtime requirement in the -libs subpackage
 BuildRequires: expat-devel >= 2.6
-
 BuildRequires: findutils
 BuildRequires: gcc
-%if %{with tests}
-BuildRequires: gcc-c++
-%endif
-%if %{with gdbm}
-BuildRequires: gdbm-devel
-%endif
 BuildRequires: git-core
-%if %{with tests}
-BuildRequires: glibc-all-langpacks
-%endif
 BuildRequires: glibc-devel
 BuildRequires: gnupg2
-%if %{with main_python}
-BuildRequires: libappstream-glib
-%endif
-%if %{undefined rhel}
-BuildRequires: libb2-devel
-%endif
+BuildRequires: libX11-devel
 BuildRequires: libffi-devel
 BuildRequires: libuuid-devel
-BuildRequires: libX11-devel
 BuildRequires: make
 BuildRequires: mpdecimal-devel
 BuildRequires: ncurses-devel
-
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: python-rpm-macros
 BuildRequires: readline-devel
 BuildRequires: redhat-rpm-config >= 127
 BuildRequires: sqlite-devel
-%if %{with tests}
-BuildRequires: gdb
-%endif
-
 BuildRequires: tcl-devel
 BuildRequires: tk-devel
+BuildRequires: xz-devel
+BuildRequires: zlib-devel
+BuildRequires: /usr/bin/dtrace
+
+%if %{undefined rhel}
+BuildRequires: libb2-devel
+%endif
+
 %if %{with tests}
+BuildRequires: gcc-c++
+BuildRequires: gdb
+BuildRequires: glibc-all-langpacks
 BuildRequires: tzdata
 %endif
 
@@ -332,10 +319,14 @@ BuildRequires: llvm(major) = 18
 BuildRequires: valgrind-devel
 %endif
 
-BuildRequires: xz-devel
-BuildRequires: zlib-devel
+%if %{with gdbm}
+BuildRequires: gdbm-devel
+%endif
 
-BuildRequires: /usr/bin/dtrace
+%if %{with main_python}
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
+%endif
 
 %if %{with rpmwheels}
 # Python 3.12 removed the deprecated imp module,