diff --git a/systemd.changes b/systemd.changes
index 2a3cf1e..ee783f1 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul 16 14:29:24 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Skip running the test units in %check for now.
+
+  Some tests don't appreciate to run inside the build environment of OBS
+  currently and some of them take an unexpected long time to execute on both
+  risc and s390x architectures.
+
 -------------------------------------------------------------------
 Thu Jul 11 10:17:06 UTC 2024 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 10ce570..c294775 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1084,8 +1084,10 @@ rm -f %{buildroot}%{_systemd_util_dir}/systemd-ssh-proxy
 %systemd_pre systemd-userdbd.service
 
 %check
+%if %{with upstream}
 # Run the unit tests.
 %meson_test
+%endif
 
 %post
 if [ $1 -eq 1 ]; then