diff --git a/librepo.changes b/librepo.changes
index 8c96054..928653d 100644
--- a/librepo.changes
+++ b/librepo.changes
@@ -8,6 +8,7 @@ Fri May 10 14:21:16 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
   + [tests] Wait for server to start instead of doing arbitrary sleep
 - Drop patch included in this release
   * Patch: librepo-PR148-clean-up-curl-target_handle.patch
+- Disable executing test suite on ARM and RISC-V due to performance issues with builders
 
 -------------------------------------------------------------------
 Sun Mar 31 18:26:16 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
diff --git a/librepo.spec b/librepo.spec
index 5bb7e08..cc97794 100644
--- a/librepo.spec
+++ b/librepo.spec
@@ -17,7 +17,13 @@
 #
 
 
+%ifarch %{arm} aarc64 riscv64
+# Don't run tests on ARM and RISC-V for now. There are problems
+# with performance on the builders and often these time out.
+%bcond_with tests
+%else
 %bcond_without tests
+%endif
 
 # zchunk is only available in Leap 15.1 and newer
 %if 0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550