diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8713a11..2f4c463 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,4 +40,12 @@ jobs:
     - name: checkout
       uses: actions/checkout@master
     - name: test
-      run: cargo test --test riscv-tests-rv64um
\ No newline at end of file
+      run: cargo test --test riscv-tests-rv64um
+  riscv-test-rv64ua:
+    name: riscv-test-rv64ua
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@master
+    - name: test
+      run: cargo test --test riscv-tests-rv64ua
\ No newline at end of file
diff --git a/tests/riscv-tests-rv64ua.rs b/tests/riscv-tests-rv64ua.rs
new file mode 100644
index 0000000..0d02127
--- /dev/null
+++ b/tests/riscv-tests-rv64ua.rs
@@ -0,0 +1,116 @@
+mod rv64ua_p {
+  use std::fs::File;
+  use std::io::prelude::*;
+  use std::path::PathBuf;
+
+  use hemu::{bus::DRAM_BASE, cpu::Mode, emulator::Emulator};
+  #[macro_export]
+  macro_rules! add_test_p {
+    ($name: ident) => {
+      #[test]
+      fn $name() -> anyhow::Result<()> {
+        let mut root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        root.push("dependencies/tests/bin/riscv-tests/rv64ua");
+        root.push("rv64ua-p-".to_owned() + stringify!($name));
+
+        let mut file = File::open(root.as_path())?;
+        let mut data = Vec::new();
+        file.read_to_end(&mut data)?;
+
+        let mut emu = Emulator::new();
+        emu.initialize_dram(data);
+        emu.initialize_pc(DRAM_BASE);
+
+        emu.start();
+
+        // Test result is stored at a0 (x10), a function argument and a return value.
+        // The riscv-tests set a0 to 0 when all tests pass.
+        assert_eq!(0, emu.cpu.gpr.read(10));
+
+        // All tests start the user mode and finish with the instruction `ecall`, independently
+        // of it succeeds or fails.
+        assert_eq!(Mode::Machine, emu.cpu.mode);
+        Ok(())
+      }
+    };
+  }
+
+  add_test_p!(amoadd_d);
+  add_test_p!(amoadd_w);
+  add_test_p!(amoand_d);
+  add_test_p!(amoand_w);
+  add_test_p!(amomax_d);
+  add_test_p!(amomax_w);
+  add_test_p!(amomaxu_d);
+  add_test_p!(amomaxu_w);
+  add_test_p!(amomin_d);
+  add_test_p!(amomin_w);
+  add_test_p!(amominu_d);
+  add_test_p!(amominu_w);
+  add_test_p!(amoor_d);
+  add_test_p!(amoor_w);
+  add_test_p!(amoswap_d);
+  add_test_p!(amoswap_w);
+  add_test_p!(amoxor_d);
+  add_test_p!(amoxor_w);
+  add_test_p!(lrsc);
+}
+
+mod rv64ua_v {
+  use std::fs::File;
+  use std::io::prelude::*;
+  use std::path::PathBuf;
+
+  use hemu::{bus::DRAM_BASE, cpu::Mode, emulator::Emulator};
+  #[macro_export]
+  macro_rules! add_test_v {
+    ($name: ident) => {
+      #[test]
+      fn $name() -> anyhow::Result<()> {
+        let mut root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        root.push("dependencies/tests/bin/riscv-tests/rv64ua");
+        root.push("rv64ua-v-".to_owned() + stringify!($name));
+
+        let mut file = File::open(root.as_path())?;
+        let mut data = Vec::new();
+        file.read_to_end(&mut data)?;
+
+        let mut emu = Emulator::new();
+        emu.initialize_dram(data);
+        emu.initialize_pc(DRAM_BASE);
+
+        emu.start();
+
+        // https://github.com/riscv/riscv-test-env/blob/4fabfb4e0d3eacc1dc791da70e342e4b68ea7e46/v/riscv_test.h#L45
+        // #define RVTEST_PASS li a0, 1; scall
+        // when all tests pass, a0 is set to 1
+        // #define RVTEST_FAIL sll a0, TESTNUM, 1; 1:beqz a0, 1b; or a0, a0, 1; scall;
+        // when test x fails, a0 is set to 2 * x + 1
+        // and if no test is run, the test will loo.
+        assert_eq!(1, emu.cpu.gpr.read(10));
+
+        assert_eq!(Mode::Supervisor, emu.cpu.mode);
+        Ok(())
+      }
+    };
+  }
+  add_test_v!(amoadd_d);
+  add_test_v!(amoadd_w);
+  add_test_v!(amoand_d);
+  add_test_v!(amoand_w);
+  add_test_v!(amomax_d);
+  add_test_v!(amomax_w);
+  add_test_v!(amomaxu_d);
+  add_test_v!(amomaxu_w);
+  add_test_v!(amomin_d);
+  add_test_v!(amomin_w);
+  add_test_v!(amominu_d);
+  add_test_v!(amominu_w);
+  add_test_v!(amoor_d);
+  add_test_v!(amoor_w);
+  add_test_v!(amoswap_d);
+  add_test_v!(amoswap_w);
+  add_test_v!(amoxor_d);
+  add_test_v!(amoxor_w);
+  add_test_v!(lrsc);
+}