diff --git a/build.sbt b/build.sbt
index b0e8c84d..a87496c9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ import Tests._
 
 // This gives us a nicer handle  to the root project instead of using the
 // implicit one
-lazy val chipyardRoot = RootProject(file("."))
+lazy val chipyardRoot = Project("chipyardRoot", file("."))
 
 lazy val commonSettings = Seq(
   organization := "edu.berkeley.cs",
diff --git a/common.mk b/common.mk
index ddb2a355..e9248953 100644
--- a/common.mk
+++ b/common.mk
@@ -36,6 +36,7 @@ TESTCHIPIP_CLASSES ?= "$(TESTCHIP_DIR)/target/scala-$(SCALA_VERSION_MAJOR)/class
 # jar creation variables and rules
 #########################################################################################
 FIRRTL_JAR := $(base_dir)/lib/firrtl.jar
+FIRRTL_TEST_JAR := $(base_dir)/test_lib/firrtl-test.jar
 
 $(FIRRTL_JAR): $(call lookup_srcs,$(CHIPYARD_FIRRTL_DIR),scala)
 	$(MAKE) -C $(CHIPYARD_FIRRTL_DIR) SBT="$(SBT)" root_dir=$(CHIPYARD_FIRRTL_DIR) build-scala
@@ -43,6 +44,12 @@ $(FIRRTL_JAR): $(call lookup_srcs,$(CHIPYARD_FIRRTL_DIR),scala)
 	cp -p $(CHIPYARD_FIRRTL_DIR)/utils/bin/firrtl.jar $@
 	touch $@
 
+$(FIRRTL_TEST_JAR): $(call lookup_srcs,$(CHIPYARD_FIRRTL_DIR),scala)
+	cd $(CHIPYARD_FIRRTL_DIR) && $(SBT) "test:assembly"
+	mkdir -p $(@D)
+	cp -p $(CHIPYARD_FIRRTL_DIR)/utils/bin/firrtl-test.jar $@
+	touch $@
+
 #########################################################################################
 # create list of simulation file inputs
 #########################################################################################
diff --git a/sims/firesim b/sims/firesim
index 6482be6d..4ec7325a 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 6482be6d2e435392815f5e24631b5644787e3467
+Subproject commit 4ec7325ac60d3dd5862798cabb823e446040b90e