diff --git a/llvm/test/Examples/Kaleidoscope/lit.local.cfg b/llvm/test/Examples/Kaleidoscope/lit.local.cfg
index 550f0b64dae6c..f96223fa865c5 100644
--- a/llvm/test/Examples/Kaleidoscope/lit.local.cfg
+++ b/llvm/test/Examples/Kaleidoscope/lit.local.cfg
@@ -1,3 +1,4 @@
 # TODO: investigate
-if not "X86" in config.root.targets:
+# RISC-V fails due to unresolved softfp functions.
+if not "X86" in config.root.targets or "riscv" in config.target_triple:
     config.unsupported = True
diff --git a/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test b/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test
index 83dbf6249cfa1..116bb3a8340a3 100644
--- a/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test
+++ b/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test
@@ -4,7 +4,7 @@
 # Instructions for debugging can be found in LLJITWithRemoteDebugging.cpp
 
 # REQUIRES: default_triple
-# UNSUPPORTED: target=powerpc64{{.*}}
+# UNSUPPORTED: target=powerpc64{{.*}}, target=s390{{.*}}
 
 # RUN: LLJITWithRemoteDebugging %p/Inputs/argc_sub1.ll 2>&1 | FileCheck --check-prefix=CHECK0 %s
 # CHECK0: __jit_debug_descriptor.last_entry = [[BEFORE0:0x[0-9a-f]+]]