1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/scala/chiselTests/OptionBundle.scala b/src/test/scala/chiselTests/OptionBundle.scala
index b9b50baa..33529633 100644
--- a/src/test/scala/chiselTests/OptionBundle.scala
+++ b/src/test/scala/chiselTests/OptionBundle.scala
@@ -3,6 +3,7 @@
 package chiselTests
 
 import chisel3._
+import chisel3.stage.ChiselStage
 import chisel3.testers.BasicTester
 
 class OptionBundle(val hasIn: Boolean) extends Bundle {
@@ -43,7 +44,7 @@ class InvalidOptionBundleTester() extends BasicTester {
   stop()
 }
 
-class OptionBundleSpec extends ChiselFlatSpec {
+class OptionBundleSpec extends ChiselFlatSpec with Utils {
   "A Bundle with an Option field" should "work properly if the Option field is not None" in {
     assertTesterPasses { new SomeOptionBundleTester(true) }
     assertTesterPasses { new SomeOptionBundleTester(false) }
@@ -54,8 +55,8 @@ class OptionBundleSpec extends ChiselFlatSpec {
   }
 
   "A Bundle with an Option field" should "assert out accessing a None Option field" in {
-    a [Exception] should be thrownBy {
-      elaborate { new InvalidOptionBundleTester() }
+    a [Exception] should be thrownBy extractCause[Exception] {
+      ChiselStage.elaborate { new InvalidOptionBundleTester() }
     }
   }
 }