diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 07688d0..4f323fb 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -30,21 +30,6 @@ Name:           javapackages-tools-%{flavor}
 %else
 Name:           javapackages-tools
 %endif
-%if %{with python}
-%if 0%{?suse_version} >= 1550
-# TW: generate subpackages for every python3 flavor
-%define python_subpackage_only 1
-%else
-%python_subpackages
-%define python_sitelib %{python3_sitelib}
-%define python_files() -n python3-%{**}
-%endif
-BuildRequires:  %{python_module lxml}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  python-rpm-macros
-BuildArch:      noarch
-%endif
 Version:        6.3.2
 Release:        0
 Summary:        Macros and scripts for Java packaging support
@@ -60,19 +45,35 @@ Patch1:         python-optional.patch
 #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did
 #               Avoid generating unresolvable requires
 Patch2:         suse-no-epoch.patch
+
 BuildRequires:  fdupes
 BuildRequires:  perl
 BuildRequires:  rpm
 BuildRequires:  xmlto
 BuildRequires:  rubygem(asciidoctor)
+%if %{with python}
+BuildRequires:  javapackages-filesystem
+%else
+Requires:       javapackages-filesystem = %{version}-%{release}
+%endif
 # Used on too many places
 Provides:       jpackage-utils = %{version}
 Obsoletes:      %{name}-doc
 Obsoletes:      jpackage-utils < %{version}
 %if %{with python}
-BuildRequires:  javapackages-filesystem
+BuildRequires:  %{python_module lxml}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  python-rpm-macros
+BuildArch:      noarch
+%if 0%{?suse_version} >= 1550
+# TW: generate subpackages for every python3 flavor
+%define python_subpackage_only 1
+%python_subpackages
 %else
-Requires:       javapackages-filesystem = %{version}-%{release}
+%define python_sitelib %python3_sitelib
+%define python_files() -n python3-%{**}
+%endif
 %endif
 
 %description