diff --git a/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/PlatformFinder.java b/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/PlatformFinder.java
index 6df99ad..2bd3092 100644
--- a/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/PlatformFinder.java
+++ b/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/PlatformFinder.java
@@ -222,6 +222,9 @@ private static String calcArchName()
         } else if(osArch.contains("aarch64")) {
                 // if the current system is aarch64 use arm as the osArch
             osArch = "arm";
+        } else if(osArch.contains("riscv")) {
+            // The openj9 jdk sets os.arch to riscv, the bisheng jdk sets it to riscv64
+            osArch = "riscv";
         } else if (osArch.length() == 4
         	 && osArch.charAt(0) == 'i'
         	 && Character.isDigit(osArch.charAt(1))