diff --git a/src/arch/riscv/pagetable_walker.cc b/src/arch/riscv/pagetable_walker.cc
index 6ec118d569..786cb8193e 100644
--- a/src/arch/riscv/pagetable_walker.cc
+++ b/src/arch/riscv/pagetable_walker.cc
@@ -386,10 +386,9 @@ Walker::WalkerState::stepWalk(PacketPtr &write)
             if (!functional)
                 walker->tlb->insert(entry.vaddr, entry);
             else {
-                Addr offset = entry.vaddr & mask(entry.logBytes);
-                Addr paddr = entry.paddr << PageShift | offset;
                 DPRINTF(PageTableWalker, "Translated %#x -> %#x\n",
-                        entry.vaddr, paddr);
+                        entry.vaddr, entry.paddr << PageShift |
+                        (entry.vaddr & mask(entry.logBytes)));
             }
         }
         endWalk();
diff --git a/tests/gem5/.testignore b/tests/gem5/.testignore
index cc61aa6133..b8cfc7f508 100644
--- a/tests/gem5/.testignore
+++ b/tests/gem5/.testignore
@@ -20,12 +20,7 @@ test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-x86_64-debug
 test-insttest-rv64i-linux-DerivO3CPU-RISCV-x86_64-debug
 test-insttest-linux-AtomicSimpleCPU-SPARC-x86_64-debug
 test-insttest-linux-TimingSimpleCPU-SPARC-x86_64-debug
-test-insttest-rv64a-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64c-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64d-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64f-linux-MinorCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64m-linux-MinorCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-AtomicSimpleCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-DerivO3CPU-RISCV-x86_64-fast