diff --git a/src/test/scala-2/chiselTests/Direction.scala b/src/test/scala/chiselTests/Direction.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Direction.scala
rename to src/test/scala/chiselTests/Direction.scala
diff --git a/src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala b/src/test/scala/chiselTests/experimental/OpaqueTypeSpec.scala
similarity index 98%
rename from src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala
rename to src/test/scala/chiselTests/experimental/OpaqueTypeSpec.scala
index d1279f2260e..6bf84470efa 100644
--- a/src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala
+++ b/src/test/scala/chiselTests/experimental/OpaqueTypeSpec.scala
@@ -103,7 +103,7 @@ object OpaqueTypeSpec {
   }
 
   // Illustrate how to dyanmically decide between OpaqueType or not
-  sealed trait MaybeBoxed[T <: Data] extends Record {
+  sealed abstract class MaybeBoxed[T <: Data] extends Record {
     def underlying: T
     def boxed:      Boolean
   }
@@ -115,12 +115,12 @@ object OpaqueTypeSpec {
   class Boxed[T <: Data](gen: T) extends MaybeBoxed[T] {
     def boxed = true
     lazy val elements = SeqMap("underlying" -> gen)
-    def underlying = elements.head._2
+    def underlying = elements.head._2.asInstanceOf[T]
   }
   class Unboxed[T <: Data](gen: T) extends MaybeBoxed[T] with OpaqueType {
     def boxed = false
     lazy val elements = SeqMap("" -> gen)
-    def underlying = elements.head._2
+    def underlying = elements.head._2.asInstanceOf[T]
   }
 
   class MaybeNoAsUInt(noAsUInt: Boolean) extends Record with OpaqueType {