diff --git a/Makefrag b/Makefrag
index 2afc2d7f..7c92290f 100644
--- a/Makefrag
+++ b/Makefrag
@@ -111,6 +111,8 @@ asm_p_tests = \
 	rv64uf-p-fmin \
 	rv64uf-p-fmadd \
 	rv64uf-p-structural \
+	rv64si-p-coreid \
+	rv64si-p-csr \
 	rv64si-pm-ipi \
 	rv64ui-pm-lrsc \
 
diff --git a/riscv-tests b/riscv-tests
index d710b4ba..a4815615 160000
--- a/riscv-tests
+++ b/riscv-tests
@@ -1 +1 @@
-Subproject commit d710b4ba5d3405a338d133f77f5d19bd12a4e8b7
+Subproject commit a481561500f43c8a022cfc0ba1695914e1df4d57
diff --git a/rocket b/rocket
index 019406da..347cff51 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 019406dafae1d5e4c55a58b9a89cd7ce6a933aa6
+Subproject commit 347cff517b12bf5fe76f410b0108788440aa613e