diff --git a/build.sbt b/build.sbt
index d44a9243..a00d7361 100644
--- a/build.sbt
+++ b/build.sbt
@@ -70,6 +70,16 @@ val firrtlVersion = "1.4.1"
 
 lazy val firrtlSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "firrtl" % firrtlVersion))
 
+// In some projects we override the default versions of Chisel and friends.
+// This map captures the expected defaults used by projects under Chipyard.
+lazy val chipyardMandatedVersions = Map(
+  "chisel-iotesters" -> "1.5.4",
+  "firrtl-interpreter" -> "1.4.4",
+  "treadle" -> "1.3.4",
+  "chisel3" -> chiselVersion,
+  "firrtl" -> firrtlVersion
+)
+
 // Subproject definitions begin
 
 // -- Rocket Chip --
@@ -129,14 +139,6 @@ lazy val rocketLibDeps = (rocketchip / Keys.libraryDependencies)
 
 // Because we're not using a release version of iotesters to work around a
 // scala test version problem, override it's libdeps to prevent using snapshots
-lazy val chipyardMandatedVersions = Map(
-  "chisel-iotesters" -> "1.5.4",
-  "firrtl-interpreter" -> "1.4.4",
-  "treadle" -> "1.3.4",
-  "chisel3" -> chiselVersion,
-  "firrtl" -> firrtlVersion
-)
-
 lazy val chisel_testers = (project in file("tools/chisel-testers"))
   .settings(chiselSettings)
   .settings(
diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch
index bdbb3a7e..f09f99d4 100644
--- a/scripts/tutorial-patches/build.sbt.patch
+++ b/scripts/tutorial-patches/build.sbt.patch
@@ -1,17 +1,17 @@
 diff --git a/build.sbt b/build.sbt
-index c38f5180..551aa8c0 100644
+index a00d7361..fbdf2e53 100644
 --- a/build.sbt
 +++ b/build.sbt
-@@ -169,7 +169,7 @@ lazy val testchipipLib = "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHO
+@@ -161,7 +161,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
+ 
  lazy val chipyard = (project in file("generators/chipyard"))
-   .sourceDependency(testchipip, testchipipLib)
-   .dependsOn(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
+   .dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
 -    sha3, // On separate line to allow for cleaner tutorial-setup patches
 +    //sha3, // On separate line to allow for cleaner tutorial-setup patches
      dsptools, `rocket-dsp-utils`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
    .settings(libraryDependencies ++= rocketLibDeps.value)
-@@ -213,10 +213,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+@@ -202,10 +202,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
    .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
  
@@ -25,4 +25,4 @@ index c38f5180..551aa8c0 100644
 +//  .settings(commonSettings)
  
  lazy val gemmini = (project in file("generators/gemmini"))
-   .sourceDependency(testchipip, testchipipLib)
+   .dependsOn(testchipip, rocketchip, chisel_testers)