diff --git a/src/test/scala/leon/test/repair/RepairSuite.scala b/src/test/scala/leon/test/repair/RepairSuite.scala
index e4a2d03f30a7377ccf66c50838c2f8f0796b4af9..e34c9fb1d1fa4ddd9cfa149943f497dfe74abf17 100644
--- a/src/test/scala/leon/test/repair/RepairSuite.scala
+++ b/src/test/scala/leon/test/repair/RepairSuite.scala
@@ -11,13 +11,6 @@ class RepairSuite extends LeonTestSuite {
     PreprocessingPhase andThen
     RepairPhase
     
-  val settings = Settings(verify = false, repair = true)
-  val reporter = new TestSilentReporter
-  val ctx0 = LeonContext(
-    reporter,
-    new InterruptManager(reporter)
-  )
-  
   val fileToFun = Map(
     "Compiler1.scala"   -> "desugar",
     "Heap4.scala"       -> "merge",
@@ -29,12 +22,20 @@ class RepairSuite extends LeonTestSuite {
   for (file <- filesInResourceDir("regression/repair/")) {
     val path = file.getAbsoluteFile().toString
     val name = file.getName()
-    val option = LeonValueOption("functions", fileToFun(name))
-    val ctx = ctx0.copy(options = option +: ctx0.options)
+
+    val reporter = new TestSilentReporter
+
+    val ctx = LeonContext(
+      reporter = reporter,
+      interruptManager = new InterruptManager(reporter),
+      options = Seq(LeonValueOption("functions", fileToFun(name)))
+    )
+
     test(name) {
       pipeline.run(ctx)(List(path))
+      if(reporter.errorCount > 0) {
+        fail("Errors during repair!")
+      }
     }
   }
-    
-  
-}
\ No newline at end of file
+}