diff --git a/compiler-rt/test/fuzzer/coverage.test b/compiler-rt/test/fuzzer/coverage.test
index ccbc3dc7cc2bf..12dc0cfac7443 100644
--- a/compiler-rt/test/fuzzer/coverage.test
+++ b/compiler-rt/test/fuzzer/coverage.test
@@ -2,6 +2,7 @@
 UNSUPPORTED: target={{.*windows.*}}
 # FIXME: CreatePCArray() emits PLT stub addresses for entry blocks, which are ignored by TracePC::PrintCoverage().
 UNSUPPORTED: target=s390x{{.*}}
+UNSUPPORTED: target=riscv64{{.*}}
 RUN: %cpp_compiler -mllvm -use-unknown-locations=Disable  %S/NullDerefTest.cpp -o %t-NullDerefTest
 RUN: %cpp_compiler -mllvm -use-unknown-locations=Disable %S/DSO1.cpp -fPIC %ld_flags_rpath_so1 -O0 -shared -o %dynamiclib1
 RUN: %cpp_compiler -mllvm -use-unknown-locations=Disable %S/DSO2.cpp -fPIC %ld_flags_rpath_so2 -O0 -shared -o %dynamiclib2
diff --git a/compiler-rt/test/fuzzer/fork.test b/compiler-rt/test/fuzzer/fork.test
index f32000c2be9a3..5db061389dce6 100644
--- a/compiler-rt/test/fuzzer/fork.test
+++ b/compiler-rt/test/fuzzer/fork.test
@@ -1,4 +1,4 @@
-# UNSUPPORTED: darwin, target={{.*freebsd.*}}, target=aarch64{{.*}}
+# UNSUPPORTED: darwin, target={{.*freebsd.*}}, target=aarch64{{.*}}, target=riscv64{{.*}}
 BINGO: BINGO
 RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest
 RUN: not %run %t-SimpleTest -fork=1 2>&1 | FileCheck %s --check-prefix=BINGO
diff --git a/compiler-rt/test/fuzzer/fork_corpus_groups.test b/compiler-rt/test/fuzzer/fork_corpus_groups.test
index 7027c767f7199..63aaffe167e9e 100644
--- a/compiler-rt/test/fuzzer/fork_corpus_groups.test
+++ b/compiler-rt/test/fuzzer/fork_corpus_groups.test
@@ -1,4 +1,4 @@
-# UNSUPPORTED: darwin, target={{.*freebsd.*}}, target=aarch64{{.*}}
+# UNSUPPORTED: darwin, target={{.*freebsd.*}}, target=aarch64{{.*}}, target=riscv64{{.*}}
 BINGO: BINGO
 RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest
 RUN: not %run %t-SimpleTest -fork=1 -fork_corpus_groups=1 2>&1 | FileCheck %s --check-prefix=BINGO
diff --git a/compiler-rt/test/fuzzer/full-coverage.test b/compiler-rt/test/fuzzer/full-coverage.test
index f189962399b0f..3dbafb705aa9e 100644
--- a/compiler-rt/test/fuzzer/full-coverage.test
+++ b/compiler-rt/test/fuzzer/full-coverage.test
@@ -2,6 +2,7 @@
 UNSUPPORTED: target={{.*windows.*}}
 # FIXME: See coverage.test.  Using UNSUPPORTED here due to random failures.
 UNSUPPORTED: target=s390x{{.*}}
+UNSUPPORTED: target=riscv64{{.*}}
 RUN: %cpp_compiler %S/DSO1.cpp -fPIC %ld_flags_rpath_so1 -O0 -shared -o %dynamiclib1
 RUN: %cpp_compiler %S/DSO2.cpp -fPIC %ld_flags_rpath_so2 -O0 -shared -o %dynamiclib2
 RUN: %cpp_compiler %S/DSOTestMain.cpp %S/DSOTestExtra.cpp %ld_flags_rpath_exe1 %ld_flags_rpath_exe2 -o %t-DSOTest
diff --git a/compiler-rt/test/fuzzer/print-func.test b/compiler-rt/test/fuzzer/print-func.test
index 7072c2a5e3cdf..af73f73aa64b5 100644
--- a/compiler-rt/test/fuzzer/print-func.test
+++ b/compiler-rt/test/fuzzer/print-func.test
@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, target=aarch64{{.*}}
+UNSUPPORTED: darwin, target=aarch64{{.*}}, target=riscv64{{.*}}
 RUN: %cpp_compiler %S/PrintFuncTest.cpp -o %t
 RUN: %run %t -seed=1 -runs=100000 2>&1 | FileCheck %s
 RUN: %run %t -seed=1 -runs=100000 -print_funcs=0 2>&1 | FileCheck %s --check-prefix=NO