diff --git a/postgresql.spec b/postgresql.spec
index 070b7ca..5779d10 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -32,7 +32,12 @@
 %{!?beta:%global beta 0}
 
 %{!?test:%global test 1}
+%ifnarch riscv64
 %{!?llvmjit:%global llvmjit 1}
+%else
+# Fail to pass tests on riscv64
+%{!?llvmjit:%global llvmjit 0}
+%endif
 %{!?upgrade:%global upgrade 1}
 %{!?plpython:%global plpython 1}
 %{!?plpython3:%global plpython3 1}
@@ -1266,6 +1271,7 @@ make -C postgresql-setup-%{setup_version} check
 %changelog
 * Sun Apr 05 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 12.2-2.0.riscv64
 - Disable spinlocks on RISC-V 64-bit (riscv64)
+- Disable LLVM/Clang for riscv64 (fails tests)
 
 * Thu Mar 12 2020 Patrik Novotný <panovotn@redhat.com> - 12.2-2
 - Fix requirements for JIT in postgresql-server-devel