diff --git a/bin/regression-wally b/bin/regression-wally
index f1abbd477..148ad777e 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -33,7 +33,7 @@ tests = [
                     "arch32i", "arch32priv", "arch32c",  "arch32m", "arch32a_amo", "arch32zifencei", "arch32zicond", 
                     "arch32zba", "arch32zbb", "arch32zbc", "arch32zbs", "arch32zfh", "arch32zfh_fma", 
                     "arch32zfh_divsqrt", "arch32zfaf", "arch32zfad", "wally32a_lrsc", "wally32priv", "wally32periph", "arch32zcb",
-                    "arch32zbkb", "arch32zbkc", "arch32zbkx", "arch32zknd", "arch32zkne", "arch32zknh", "arch32vm_sv32"]], # Add when working: arch32pmp
+                    "arch32zbkb", "arch32zbkc", "arch32zbkx", "arch32zknd", "arch32zkne", "arch32zknh", "arch32vm_sv32", "arch32pmp"]],
         ["rv64i", ["arch64i"]]
         ]
 
@@ -60,7 +60,7 @@ tests64gc_nofp = [
         ["rv64gc", ["coverage64gc", "arch64i", "arch64priv", "arch64c",  "arch64m", "arch64zcb",
                     "arch64zifencei", "arch64zicond", "arch64a_amo", "wally64a_lrsc", "wally64periph", "wally64priv", 
                     "arch64zbkb", "arch64zbkc", "arch64zbkx", "arch64zknd", "arch64zkne", "arch64zknh",
-                    "arch64zba",  "arch64zbb",  "arch64zbc", "arch64zbs"]] # add when working: "arch64zicboz", "arch64pmp"
+                    "arch64zba",  "arch64zbb",  "arch64zbc", "arch64zbs", "arch64pmp"]] # add when working: "arch64zicboz"
     ]
 
 tests64gc_fp = [
diff --git a/testbench/tests.vh b/testbench/tests.vh
index 817b8d6d5..923327986 100644
--- a/testbench/tests.vh
+++ b/testbench/tests.vh
@@ -194,6 +194,7 @@ string arch32pmp[] = '{
   "rv32i_m/pmp32/src/pmp-TOR-X.S"
 };
 
+// Tests commented out pending riscv-arch-test issue #588
 string arch64pmp[] = '{
   `RISCVARCHTEST,
   "rv64i_m/pmp64/src/pmp64-CFG-reg.S",
@@ -217,7 +218,7 @@ string arch64pmp[] = '{
   "rv64i_m/pmp64/src/pmp64-NAPOT-RW-priority-level-2.S",
   "rv64i_m/pmp64/src/pmp64-NAPOT-RW-priority.S",
   "rv64i_m/pmp64/src/pmp64-NAPOT-RW.S",
-  "rv64i_m/pmp64/src/pmp64-NAPOT-RWX.S",
+  // "rv64i_m/pmp64/src/pmp64-NAPOT-RWX.S",
   "rv64i_m/pmp64/src/pmp64-NAPOT-RX-priority-level-2.S",
   "rv64i_m/pmp64/src/pmp64-NAPOT-RX-priority.S",
   "rv64i_m/pmp64/src/pmp64-NAPOT-RX.S",
@@ -230,7 +231,7 @@ string arch64pmp[] = '{
   "rv64i_m/pmp64/src/pmp64-TOR-RW-priority-level-2..S",
   "rv64i_m/pmp64/src/pmp64-TOR-RW-priority.S",
   "rv64i_m/pmp64/src/pmp64-TOR-RW.S",
-  "rv64i_m/pmp64/src/pmp64-TOR-RWX.S",
+  // "rv64i_m/pmp64/src/pmp64-TOR-RWX.S",
   "rv64i_m/pmp64/src/pmp64-TOR-RX-priority-level-2.S",
   "rv64i_m/pmp64/src/pmp64-TOR-RX-priority.S",
   "rv64i_m/pmp64/src/pmp64-TOR-RX.S",