diff --git a/generators/testchipip b/generators/testchipip
index b3aa1bea53..56bfaa3f9b 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit b3aa1bea536ee96a1e69796d35f7651a314c2f6a
+Subproject commit 56bfaa3f9bcd11206d93fdfa3c8e7656665e462a
diff --git a/generators/utilities/src/main/scala/Simulator.scala b/generators/utilities/src/main/scala/Simulator.scala
index b2982db755..f40ad032d0 100644
--- a/generators/utilities/src/main/scala/Simulator.scala
+++ b/generators/utilities/src/main/scala/Simulator.scala
@@ -83,6 +83,8 @@ object GenerateSimFiles extends App with HasGenerateSimConfig {
   }
   def resources(sim: Simulator): Seq[String] = Seq(
     "/testchipip/csrc/SimSerial.cc",
+    "/testchipip/csrc/testchip_tsi.cc",
+    "/testchipip/csrc/testchip_tsi.h",
     "/testchipip/csrc/SimDRAM.cc",
     "/testchipip/csrc/mm.h",
     "/testchipip/csrc/mm.cc",
diff --git a/sims/firesim b/sims/firesim
index ef615d35da..6318184f30 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit ef615d35da118e73f5128d373f17b80884100773
+Subproject commit 6318184f304315a94b5eb5c670f0eec1a3205f59