diff --git a/check.spec.inc b/check.spec.inc
index e7cde61..acbe95f 100644
--- a/check.spec.inc
+++ b/check.spec.inc
@@ -88,8 +88,12 @@ export LIT_XFAIL="$LIT_XFAIL;clang/test/CodeGen/profile-filter.c"
 
 %ifarch riscv64
 export LIT_XFAIL="$LIT_XFAIL;clang/test/OpenMP/declare_variant_device_isa_codegen_1.c"
+export LIT_XFAIL="$LIT_XFAIL;OpenMP/declare_variant_device_isa_codegen_1.c"
+test_list_filter_out+=("Clang :: OpenMP/declare_variant_device_isa_codegen_1.c")
 %endif
 
+export LIT_FILTER_OUT=$(test_list_to_regex test_list_filter_out)
+
 %cmake_build --target check-clang || true
 #endregion
 
@@ -251,6 +255,19 @@ export LIT_XFAIL="$LIT_XFAIL;offloading/thread_state_1.c"
 export LIT_XFAIL="$LIT_XFAIL;offloading/thread_state_2.c"
 %endif
 
+%ifarch riscv64
+export LIT_XFAIL="$LIT_XFAIL;affinity/kmp-affinity.c"
+export LIT_XFAIL="$LIT_XFAIL;affinity/kmp-hw-subset.c"
+export LIT_XFAIL="$LIT_XFAIL;affinity/omp-places.c"
+export LIT_XFAIL="$LIT_XFAIL;ompt/misc/control_tool.c"
+export LIT_XFAIL="$LIT_XFAIL;ompt/synchronization/barrier/explicit.c"
+export LIT_XFAIL="$LIT_XFAIL;ompt/synchronization/critical.c"
+export LIT_XFAIL="$LIT_XFAIL;ompt/synchronization/flush.c"
+export LIT_XFAIL="$LIT_XFAIL;ompt/synchronization/ordered.c"
+export LIT_XFAIL="$LIT_XFAIL;ompt/synchronization/taskgroup.c"
+export LIT_XFAIL="$LIT_XFAIL;ompt/synchronization/taskwait.c"
+%endif
+
 export LIT_FILTER_OUT=$(test_list_to_regex test_list_filter_out)
 
 %cmake_build --target check-openmp || true
diff --git a/files.spec.inc b/files.spec.inc
index d00fc1c..5e36b98 100644
--- a/files.spec.inc
+++ b/files.spec.inc
@@ -552,7 +552,7 @@
 %{_prefix}/lib/clang/%{maj_ver}/lib/%{compiler_rt_triple}/clang_rt.crtend.o
 %endif
 
-%ifnarch %{ix86} s390x
+%ifnarch %{ix86} s390x riscv64
 %{_prefix}/lib/clang/%{maj_ver}/lib/%{compiler_rt_triple}/liborc_rt.a
 %endif