diff --git a/groundtest b/groundtest
index 466d79bd..081c5350 160000
--- a/groundtest
+++ b/groundtest
@@ -1 +1 @@
-Subproject commit 466d79bd63f714125b3947b54f1ad308c6403c04
+Subproject commit 081c53505564d55e3c0cf1a30d6234d179b4650a
diff --git a/junctions b/junctions
index 54cf8630..36ecbfdf 160000
--- a/junctions
+++ b/junctions
@@ -1 +1 @@
-Subproject commit 54cf86301b13ebb7a26268da6afb7402bcbfed57
+Subproject commit 36ecbfdfb56f185e5df3142602a9e1f12742f48d
diff --git a/src/main/scala/DirectGroundTest.scala b/src/main/scala/DirectGroundTest.scala
index c0ba9df1..4d292ed3 100644
--- a/src/main/scala/DirectGroundTest.scala
+++ b/src/main/scala/DirectGroundTest.scala
@@ -3,6 +3,7 @@ package rocketchip
 import Chisel._
 import cde.{Parameters, Field}
 import groundtest._
+import groundtest.common._
 import uncore.tilelink._
 import uncore.agents._
 
diff --git a/src/main/scala/TestConfigs.scala b/src/main/scala/TestConfigs.scala
index aab2a421..3b86039a 100644
--- a/src/main/scala/TestConfigs.scala
+++ b/src/main/scala/TestConfigs.scala
@@ -2,6 +2,8 @@ package rocketchip
 
 import Chisel._
 import groundtest._
+import groundtest.unittests._
+import groundtest.common._
 import rocket._
 import uncore.tilelink._
 import uncore.coherence._
@@ -162,6 +164,17 @@ class WithUnitTest extends Config(
     case GroundTestKey => Seq.fill(site(NTiles)) { GroundTestTileSettings() }
     case BuildGroundTest =>
       (p: Parameters) => Module(new UnitTestSuite()(p))
+    case UnitTests => (testParams: Parameters) => {
+      implicit val p = testParams
+      Seq(
+        Module(new MultiWidthFifoTest),
+        Module(new SmiConverterTest),
+        Module(new AtosConverterTest),
+        Module(new NastiMemoryDemuxTest),
+        Module(new ROMSlaveTest),
+        Module(new TileLinkRAMTest),
+        Module(new HastiTest))
+    }
     case _ => throw new CDEMatchError
   })
 
diff --git a/uncore b/uncore
index 09a1ec6d..29747acb 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 09a1ec6d6bbf19afbd661d937ce4ea949ba0644f
+Subproject commit 29747acb332510b75005953344df2c5ef6a3dff4