diff --git a/python3.12.spec b/python3.12.spec
index 003ef8a..41bab5a 100644
--- a/python3.12.spec
+++ b/python3.12.spec
@@ -17,7 +17,7 @@ URL: https://www.python.org/
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 2%{?dist}
+Release: 2.0.riscv64%{?dist}
 License: Python-2.0.1
 
 
@@ -1153,9 +1153,17 @@ CheckPython() {
   # see: https://github.com/python/cpython/issues/104280#issuecomment-1669249980
 
   LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
-    -wW --slowest %{_smp_mflags} --timeout=2700 \
+    -wW --slowest %{_smp_mflags} \
+    %ifnarch riscv64
+    --timeout=2700 \
+    %else
+    --timeout=27000 \
+    %endif
     -i test_freeze_simple_script \
     -i test_check_probes \
+    %ifarch riscv64
+    -x test_eintr \
+    %endif
     %ifarch %{mips64}
     -x test_ctypes \
     %endif
@@ -1666,6 +1674,10 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Fri Oct 13 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.12.0-2.0.riscv64
+- Increase tests timeout on riscv64 by 10x.
+- Disable test_eintr test on riscv64.
+
 * Thu Oct 05 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 3.12.0-2
 - Use bundled libb2 in RHEL builds