diff --git a/build.sbt b/build.sbt
index 31ea7b0f..1bbf8f11 100644
--- a/build.sbt
+++ b/build.sbt
@@ -241,6 +241,12 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
 lazy val radiance = (project in file("generators/radiance"))
   .dependsOn(rocketchip, gemmini)
   .settings(libraryDependencies ++= rocketLibDeps.value)
+  .settings(libraryDependencies ++= Seq(
+      "edu.berkeley.cs" %% "chiseltest" % chiselTestVersion,
+      "org.scalatest" %% "scalatest" % "3.2.+" % "test",
+      "junit" % "junit" % "4.13" % "test",
+      "org.scalacheck" %% "scalacheck" % "1.14.3" % "test",
+  ))
   .settings(commonSettings)
 
 lazy val gemmini = freshProject("gemmini", file("generators/gemmini"))
diff --git a/sims/vcs/vcs.mk b/sims/vcs/vcs.mk
index 3876a43d..258435b2 100644
--- a/sims/vcs/vcs.mk
+++ b/sims/vcs/vcs.mk
@@ -39,7 +39,7 @@ VCS_NONCC_OPTS = \
 	-j36 \
 	-notice \
 	-line \
-	+lint=all,noVCDE,noONGS,noUI,noPCTIO-L,noPCTI-L \
+	+lint=all,noVCDE,noONGS,noUI,noPCTIO-L,noPCTI-L,noNS \
 	-error=PCWM-L \
 	-error=noZMMCM \
 	-timescale=1ns/10ps \
diff --git a/toolchains/riscv-tools/riscv-isa-sim b/toolchains/riscv-tools/riscv-isa-sim
index e46fc096..4d8651be 160000
--- a/toolchains/riscv-tools/riscv-isa-sim
+++ b/toolchains/riscv-tools/riscv-isa-sim
@@ -1 +1 @@
-Subproject commit e46fc096e2402c2149caee93111569f5a1dd165a
+Subproject commit 4d8651be943ea706eb8dcb3443add2e7ccc117a6
diff --git a/toolchains/riscv-tools/riscv-pk b/toolchains/riscv-tools/riscv-pk
index e681d808..e8e6b3aa 160000
--- a/toolchains/riscv-tools/riscv-pk
+++ b/toolchains/riscv-tools/riscv-pk
@@ -1 +1 @@
-Subproject commit e681d8088bf67af83d7735244c22614d990dfdaf
+Subproject commit e8e6b3aaee44d43b48164fbd377864c3a682dbd3