diff --git a/src/test/scala/leon/genc/GenCSuite.scala b/src/test/scala/leon/genc/GenCSuite.scala
index 4292f9583927e3299dde8e4b4d6bdddec0d7f146..df6d30e5c0869cb6f05ba08195fab4ed73593d89 100644
--- a/src/test/scala/leon/genc/GenCSuite.scala
+++ b/src/test/scala/leon/genc/GenCSuite.scala
@@ -189,8 +189,7 @@ class GenCSuite extends LeonRegressionSuite {
     override def suiteName = "Verification Suite For GenC"
 
     // Add a timeout for the verification
-    override def optionVariants =
-      super.optionVariants map { opts => "--timeout=5" :: opts }
+    override val optionVariants = List(List("--solvers=smt-z3,ground"))
   }
 
   // Run verification suite as a nested suite
diff --git a/src/test/scala/leon/regression/verification/VerificationSuite.scala b/src/test/scala/leon/regression/verification/VerificationSuite.scala
index d7eafb38c80075092d4c57ab25e83e9c80b5573d..f2ae97880694baac498b94570f81beb1c21c422f 100644
--- a/src/test/scala/leon/regression/verification/VerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/VerificationSuite.scala
@@ -19,7 +19,7 @@ import org.scalatest.{Reporter => _, _}
 // This is because we compile all tests from each folder together.
 trait VerificationSuite extends LeonRegressionSuite {
 
-  def optionVariants: List[List[String]]
+  val optionVariants: List[List[String]]
   val testDir: String
 
   val ignored: Seq[String] = Seq()
diff --git a/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala b/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
index 0b6a0c37d99277ce64ba3e095e13e78cb478bd7b..6fe7b07408500929063b4f57f24e1147a6cfce35 100644
--- a/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
@@ -9,7 +9,7 @@ import leon.solvers.SolverFactory
 // This is because we compile all tests from each folder together.
 class XLangVerificationSuite extends VerificationSuite {
 
-  def optionVariants: List[List[String]] = {
+  val optionVariants: List[List[String]] = {
     val isZ3Available = SolverFactory.hasZ3
 
     List(
@@ -25,3 +25,4 @@ class XLangVerificationSuite extends VerificationSuite {
   val testDir: String = "regression/verification/xlang/"
   override val desugarXLang = true
 }
+