diff --git a/automated/bin/riscv64/skipgen b/automated/bin/riscv64/skipgen
new file mode 100755
index 000000000..71f7b94ef
Binary files /dev/null and b/automated/bin/riscv64/skipgen differ
diff --git a/automated/lib/sh-test-lib b/automated/lib/sh-test-lib
index 9fb79ea1b..f25a61735 100755
--- a/automated/lib/sh-test-lib
+++ b/automated/lib/sh-test-lib
@@ -210,6 +210,7 @@ detect_abi() {
       #aarch64_be) abi="arm64be" ;;
       i*86) abi="i386" ;;
       x86_64) abi="x86_64" ;;
+      riscv64) abi="riscv64" ;;
       *) error_msg "Unsupported architecture: ${abi}" ;;
     esac
 }