diff --git a/.travis.yml b/.travis.yml
index 493238da..eabe540a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,17 @@ cache:
   directories:
     $HOME/.ivy2
     regression/install
+    chisel/target
+    context-dependent-environments/target
+    groundtest/target
+    hardfloat/target
+    junctions/target
+    project/project/target
+    project/target
+    rocket/target
+    target
+    uncore/target
+    zscale/target
 
 # packages needed to build riscv-tools
 addons:
diff --git a/regression/Makefile b/regression/Makefile
index 8f630efc..877d944d 100644
--- a/regression/Makefile
+++ b/regression/Makefile
@@ -76,6 +76,7 @@ stamps/other-submodules.stamp:
 	git -C $(abspath $(TOP)) submodule update --init --recursive rocket
 	git -C $(abspath $(TOP)) submodule update --init --recursive torture
 	git -C $(abspath $(TOP)) submodule update --init --recursive uncore
+	git -C $(abspath $(TOP)) submodule update --init --recursive zscale
 	date > $@
 
 $(RISCV)/install.stamp:
diff --git a/src/main/scala/Testing.scala b/src/main/scala/Testing.scala
index cc2df3c4..8a0d33d0 100644
--- a/src/main/scala/Testing.scala
+++ b/src/main/scala/Testing.scala
@@ -49,7 +49,7 @@ run-$makeTargetName-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $$($
 }
 
 class AssemblyTestSuite(makePrefix: String, toolsPrefix: String, val names: LinkedHashSet[String])(envName: String) extends RocketTestSuite {
-  val dir = "$(base_dir)/riscv-tools/riscv-tests/isa"
+  val dir = "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/isa"
   val makeTargetName = makePrefix + "-" + envName + "-asm-tests"
   override def toString = s"$makeTargetName = \\\n" + names.map(n => s"\t$toolsPrefix-$envName-$n").mkString(" \\\n") + postScript
 }