diff --git a/generator/actions.ml b/generator/actions.ml
index 179902efe..9053180a3 100644
--- a/generator/actions.ml
+++ b/generator/actions.ml
@@ -795,6 +795,8 @@ to specify the QEMU interface emulation to use at run time." };
         [["file_architecture"; "/bin-ppc64-dynamic"]], "ppc64"), [];
       InitISOFS, Always, TestResultString (
         [["file_architecture"; "/bin-ppc64le-dynamic"]], "ppc64le"), [];
+      InitISOFS, Always, TestResultString (
+        [["file_architecture"; "/bin-riscv64-dynamic"]], "riscv64"), [];
       InitISOFS, Always, TestResultString (
         [["file_architecture"; "/bin-sparc-dynamic"]], "sparc"), [];
       InitISOFS, Always, TestResultString (
@@ -813,6 +815,8 @@ to specify the QEMU interface emulation to use at run time." };
         [["file_architecture"; "/lib-ppc64.so"]], "ppc64"), [];
       InitISOFS, Always, TestResultString (
         [["file_architecture"; "/lib-ppc64le.so"]], "ppc64le"), [];
+      InitISOFS, Always, TestResultString (
+        [["file_architecture"; "/lib-riscv64.so"]], "riscv64"), [];
       InitISOFS, Always, TestResultString (
         [["file_architecture"; "/lib-sparc.so"]], "sparc"), [];
       InitISOFS, Always, TestResultString (
diff --git a/test-data/Makefile.am b/test-data/Makefile.am
index 93d094a4d..86cd5a280 100644
--- a/test-data/Makefile.am
+++ b/test-data/Makefile.am
@@ -41,6 +41,7 @@ image_files = \
 	$(srcdir)/binaries/bin-mipsel-dynamic \
 	$(srcdir)/binaries/bin-ppc64-dynamic \
 	$(srcdir)/binaries/bin-ppc64le-dynamic \
+	$(srcdir)/binaries/bin-riscv64-dynamic \
 	$(srcdir)/binaries/bin-sparc-dynamic \
 	$(srcdir)/binaries/bin-win32.exe \
 	$(srcdir)/binaries/bin-win64.exe \
@@ -52,6 +53,7 @@ image_files = \
 	$(srcdir)/binaries/lib-mipsel.so \
 	$(srcdir)/binaries/lib-ppc64.so \
 	$(srcdir)/binaries/lib-ppc64le.so \
+	$(srcdir)/binaries/lib-riscv64.so \
 	$(srcdir)/binaries/lib-sparc.so \
 	$(srcdir)/binaries/lib-win32.dll \
 	$(srcdir)/binaries/lib-win64.dll \
diff --git a/test-data/binaries/Makefile.am b/test-data/binaries/Makefile.am
index 094cb3502..ccc7d0046 100644
--- a/test-data/binaries/Makefile.am
+++ b/test-data/binaries/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
 	bin-mipsel-dynamic \
 	bin-ppc64-dynamic \
 	bin-ppc64le-dynamic \
+	bin-riscv64-dynamic \
 	bin-sparc-dynamic \
 	bin-win32.exe \
 	bin-win64.exe \
@@ -37,6 +38,7 @@ EXTRA_DIST = \
 	lib-ppc64.so \
 	lib-ppc64le.so \
 	lib-mipsel.so \
+	lib-riscv64.so \
 	lib-sparc.so \
 	lib-win32.dll \
 	lib-win64.dll \
diff --git a/test-data/binaries/bin-riscv64-dynamic b/test-data/binaries/bin-riscv64-dynamic
new file mode 100755
index 000000000..a8b4baa0e
Binary files /dev/null and b/test-data/binaries/bin-riscv64-dynamic differ
diff --git a/test-data/binaries/lib-riscv64.so b/test-data/binaries/lib-riscv64.so
new file mode 100755
index 000000000..764965cc7
Binary files /dev/null and b/test-data/binaries/lib-riscv64.so differ