diff --git a/xCAT-test/unit/debian_arch_map.t b/xCAT-test/unit/debian_arch_map.t
index 617004a43..08c140cec 100644
--- a/xCAT-test/unit/debian_arch_map.t
+++ b/xCAT-test/unit/debian_arch_map.t
@@ -38,6 +38,10 @@ is(xCAT::Utils->xcat_arch_from_debian('ppc64el'), 'ppc64el',
     'POWER LE media keeps the Debian name xCAT uses for Ubuntu');
 is(xCAT::Utils->xcat_arch_from_debian('powerpc'), 'ppc64',
     'POWER BE media installs ppc64 nodes');
+is(xCAT::Utils->xcat_arch_from_debian('riscv64'), 'riscv64',
+    'riscv64 media installs riscv64 nodes');
+is(xCAT::Utils->debian_arch('riscv64'), 'riscv64',
+    'Debian and xCAT agree on the riscv64 name');
 is(xCAT::Utils->xcat_arch_from_debian('nonesuch'), undef,
     'media xCAT has no name for resolves to nothing');
 is(xCAT::Utils->xcat_arch_from_debian(''), undef,
diff --git a/xCAT-test/unit/debian_install_boot_files.t b/xCAT-test/unit/debian_install_boot_files.t
index b5783bc94..dc664cbb0 100644
--- a/xCAT-test/unit/debian_install_boot_files.t
+++ b/xCAT-test/unit/debian_install_boot_files.t
@@ -91,6 +91,18 @@ is(
     'POWER does not accept the x86 live layout',
 );
 
+# --- riscv64 -------------------------------------------------------------
+is(
+    resolved('riscv64', 'riscv64', media('casper/vmlinux', 'casper/initrd')),
+    'casper/vmlinux|casper/initrd',
+    'the riscv64 live image keeps its kernel under a different name',
+);
+is(
+    resolved('riscv64', 'riscv64', media('casper/vmlinuz', 'casper/initrd')),
+    undef,
+    'riscv64 does not accept the kernel name the other live images use',
+);
+
 # --- nothing to boot -------------------------------------------------------
 is(resolved('x86_64', 'amd64', media('casper/vmlinuz')), undef,
     'a kernel without its initrd is not a match');