diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index 86e382fe..b9465fa7 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -287,6 +287,9 @@ class WithCacheFillTest extends Config(
   (pname, site, here) => pname match {
     case BuildGroundTest =>
       (id: Int, p: Parameters) => Module(new CacheFillTest()(p))
+  },
+  knobValues = {
+    case "L2_WAYS" => 4
     case "L2_CAPACITY_IN_KB" => 4
   })
 
diff --git a/uncore b/uncore
index 94f90fb2..1857f36c 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 94f90fb21b0337fa43ab3160bb254802a7d6bb17
+Subproject commit 1857f36c1e6f2b2859c724eea6ae3cfb2618f81b