diff --git a/src/test/scala/leon/test/LeonTestSuite.scala b/src/test/scala/leon/test/LeonTestSuite.scala
index c94097df5f74c5491fab9f854bcc1d11eb81df88..4defa22568bf6e9ffcf14f2fd621cd98a95b26f0 100644
--- a/src/test/scala/leon/test/LeonTestSuite.scala
+++ b/src/test/scala/leon/test/LeonTestSuite.scala
@@ -8,6 +8,7 @@ import leon.utils._
 
 import scala.io.Source
 import org.scalatest._
+import org.scalatest.time.Span
 import org.scalatest.concurrent._
 import org.scalatest.time.SpanSugar._
 import org.scalatest.exceptions.TestFailedException
@@ -102,13 +103,13 @@ trait LeonTestSuite extends FunSuite with Timeouts with BeforeAndAfterEach {
     }
   }
 
-  override def test(name: String, tags: Tag*)(body: => Unit) {
-    super.test(name, tags: _*) {
+  def testWithTimeout(name: String, timeout: Span)(body: => Unit) {
+    super.test(name) {
       val id = testIdentifier(name)
 
       val ts = now()
 
-      failAfter(5.minutes) {
+      failAfter(timeout) {
         try {
           body
         } catch {
@@ -133,6 +134,11 @@ trait LeonTestSuite extends FunSuite with Timeouts with BeforeAndAfterEach {
     }
   }
 
+
+  override def test(name: String, tags: Tag*)(body: => Unit) {
+    testWithTimeout(name, 5.minutes)(body)
+  }
+
   protected val all : String=>Boolean = (s : String) => true
 
  
diff --git a/src/test/scala/leon/test/testcases/TestCasesCompile.scala b/src/test/scala/leon/test/testcases/TestCasesCompile.scala
index 8f22d4578b6e268b724e4b12b7b1bd45978d8629..b5fe1ca32d128891662989877267386b2f713463 100644
--- a/src/test/scala/leon/test/testcases/TestCasesCompile.scala
+++ b/src/test/scala/leon/test/testcases/TestCasesCompile.scala
@@ -3,6 +3,7 @@
 package leon.test.testcases
 
 import leon._
+import org.scalatest.time.SpanSugar._
 import test.LeonTestSuite
 import java.io.File
 import org.scalatest.ParallelTestExecution
@@ -36,7 +37,7 @@ class TestCasesCompile extends LeonTestSuite {
 
   val slashes = resourceDir(baseDir).getAbsolutePath.split("/").toList.size
 
-  test("Compiling testcases") {
+  testWithTimeout("Compiling testcases", 10.minutes) {
     val all = (filesIn(baseDir+"repair/") ++
                filesIn(baseDir+"runtime/") ++
                filesIn(baseDir+"synthesis/") ++