diff --git a/src/test/scala/leon/test/LeonTestSuite.scala b/src/test/scala/leon/test/LeonTestSuite.scala
index f802d73b20486dc7e97346220bb94fd105092476..3ee2480d62ab726e5fb050bddf9f1fd6ab68524c 100644
--- a/src/test/scala/leon/test/LeonTestSuite.scala
+++ b/src/test/scala/leon/test/LeonTestSuite.scala
@@ -1,10 +1,12 @@
 package leon.test
 import scala.io.Source
 import org.scalatest._
+import org.scalatest.concurrent._
+import org.scalatest.time.SpanSugar._
 
 import java.io.File
 
-trait LeonTestSuite extends FunSuite {
+trait LeonTestSuite extends FunSuite with Timeouts {
   def now() = {
     System.currentTimeMillis
   }
@@ -72,7 +74,9 @@ trait LeonTestSuite extends FunSuite {
       val id = testIdentifier(name)
       val ts = now()
 
-      body
+      failAfter(2.minutes) {
+        body
+      }
 
       val total = now()-ts