diff --git a/nss.spec b/nss.spec
index ff7b7d4..85b70bc 100644
--- a/nss.spec
+++ b/nss.spec
@@ -17,7 +17,11 @@
 %global dracut_modules_dir %{dracutlibdir}/modules.d/05nss-softokn/
 %global dracut_conf_dir %{dracutlibdir}/dracut.conf.d
 
+%ifnarch riscv64
 %bcond_without tests
+%else
+%bcond_with tests
+%endif
 %bcond_with dbm
 
 # Produce .chk files for the final stripped binaries
@@ -60,7 +64,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
 Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version}
-Release:          %{nss_release}%{?dist}
+Release:          %{nss_release}.0.riscv64%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Requires:         nspr >= %{nspr_version}
@@ -1094,6 +1098,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Wed Mar 1 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.87.0-2.0.riscv64
+- Disable tests on riscv64
+
 * Tue Jan 24 2023 Bob Relyea - 3.87.0-2
 - Fix rebuild errors