diff --git a/meson.changes b/meson.changes
index 01583dd..43ed787 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 20 19:27:23 UTC 2020 - Michael Gorse <mgorse@suse.com>
+
+- Make tests arch-dependent. Needed to exclude mono tests on s390x
+  (bsc#1171934).
+
 -------------------------------------------------------------------
 Fri May 15 10:23:21 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/meson.spec b/meson.spec
index 5eda702..6ea2241 100644
--- a/meson.spec
+++ b/meson.spec
@@ -52,7 +52,9 @@ Patch5:         meson-distutils.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base
+%if "%{flavor}" != "test"
 BuildArch:      noarch
+%endif
 %if %{with setuptools}
 BuildRequires:  python3-setuptools
 Requires:       python3-setuptools