diff --git a/groundtest b/groundtest
index 2c3cb008..26f8823e 160000
--- a/groundtest
+++ b/groundtest
@@ -1 +1 @@
-Subproject commit 2c3cb00867c1e78db4dc8360fd61745843abed95
+Subproject commit 26f8823eaccadc4ad74ce9d4b73c6b388b53c21a
diff --git a/src/main/scala/TestConfigs.scala b/src/main/scala/TestConfigs.scala
index 3b86039a..d733ff4d 100644
--- a/src/main/scala/TestConfigs.scala
+++ b/src/main/scala/TestConfigs.scala
@@ -179,17 +179,28 @@ class WithUnitTest extends Config(
   })
 
 class WithTraceGen extends Config(
-  (pname, site, here) => pname match {
+  topDefinitions = (pname, site, here) => pname match {
     case GroundTestKey => Seq.fill(site(NTiles)) {
       GroundTestTileSettings(cached = 1)
     }
     case BuildGroundTest =>
       (p: Parameters) => Module(new GroundTestTraceGenerator()(p))
     case GeneratorKey => GeneratorParameters(
-      maxRequests = 128,
+      maxRequests = 256,
       startAddress = 0)
-    case AddressBag => List(0x8, 0x10, 0x108, 0x100008)
+    case AddressBag => {
+      val nSets = 16
+      val nWays = 1
+      val blockOffset = site(CacheBlockOffsetBits)
+      List.tabulate(2 * nWays) { i =>
+        Seq.tabulate(2) { j => (i * nSets + j * 8) << blockOffset }
+      }.flatten
+    }
     case _ => throw new CDEMatchError
+  },
+  knobValues = {
+    case "L1D_SETS" => 16
+    case "L1D_WAYS" => 1
   })
 
 class GroundTestConfig extends Config(new WithGroundTest ++ new BaseConfig)