diff --git a/freecell-solver.spec b/freecell-solver.spec
index 8ab6699..9d1475b 100644
--- a/freecell-solver.spec
+++ b/freecell-solver.spec
@@ -4,7 +4,7 @@
 
 Name: freecell-solver
 Version: 6.8.0
-Release: 4%{?dist}
+Release: 4.0.riscv64%{?dist}
 License: MIT
 Source0: https://fc-solve.shlomifish.org/downloads/fc-solve/%{name}-%{version}.tar.xz
 URL: https://fc-solve.shlomifish.org/
@@ -49,7 +49,9 @@ BuildRequires: perl(Test::Data::Split::Backend::Hash)
 BuildRequires: perl(Test::Data::Split::Backend::ValidateHash)
 BuildRequires: perl(Test::Differences)
 BuildRequires: perl(Test::More)
+%ifarch %{valgrind_arches}
 BuildRequires: perl(Test::RunValgrind)
+%endif
 BuildRequires: perl(Test::TrailingSpace)
 BuildRequires: perl(Test::Trap)
 BuildRequires: perl(warnings)
@@ -68,7 +70,9 @@ BuildRequires: python3dist(pycotap)
 Requires: %{libname}%{?_isa} = %{version}-%{release}
 # BuildRequires: tap-devel
 BuildRequires: the_silver_searcher
+%ifarch %{valgrind_arches}
 BuildRequires: valgrind
+%endif
 
 %description
 The Freecell Solver package contains the fc-solve executable which is
@@ -154,10 +158,12 @@ Freecell Solver from within your programs.
 %cmake_build
 
 %check
+%ifnarch riscv64
 %__rm -f t/t/py-flake8.t t/t/tidyall.t
 src="`pwd`"
 cd "%{__cmake_builddir}"
 perl "$src"/run-tests.pl
+%endif
 
 %install
 %cmake_install
@@ -173,6 +179,9 @@ chmod a-x "$dest/$bn"
 find %{buildroot} -name *.a -delete
 
 %changelog
+* Mon Jan 08 2023 David Abdurachmanov <davidlt@rivosinc.com> - 6.8.0-4.0.riscv64
+- Disable tests on riscv64 (no valgrind)
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild