diff --git a/python-pypet.spec b/python-pypet.spec
index 17883a7..ea64540 100644
--- a/python-pypet.spec
+++ b/python-pypet.spec
@@ -36,12 +36,19 @@ License:        BSD-3-Clause
 URL:            https://github.com/SmokinCaterpillar/pypet
 Source:         %{url}/archive/%{version}/pypet-%{version}.tar.gz
 
-BuildArch:      noarch
+# We have an arched base package and noarch binary RPMs to ensure that the
+# tests always run on all architectures, since this package has a history of
+# architecture-dependent failures. However, there is no compiled code in the
+# package.
+%global debug_package %{nil}
 
 %description %_description
 
 %package -n python3-pypet
 Summary:        %{summary}
+
+BuildArch:      noarch
+
 BuildRequires:  python3-devel
 BuildRequires:  %{py3_dist setuptools}
 BuildRequires:  google-benchmark-devel
@@ -70,6 +77,8 @@ BuildRequires:  latexmk
 %package doc
 Summary:        %{summary}
 
+BuildArch:      noarch
+
 %description doc
 Documentation for %{name}.
 
@@ -98,8 +107,8 @@ PYTHONPATH="${PWD}" %make_build -C doc latex \
 # https://github.com/SmokinCaterpillar/pypet/issues/56
 %if %{with tests}
 export HDF5_DISABLE_VERSION_CHECK=1
+%ifarch s390x
 # Memory issues on s390x: OverflowError: Python int too large to convert to C int
-%if "%{_host_cpu}" == "s390x"
 echo "Skip tests on s390x"
 %else
 PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} pypet/tests/all_single_core_tests.py