diff --git a/build.sbt b/build.sbt
index 4b8234b849d852eaa8db6a7a9073dcb9bd530307..bcbcc7ee0950df27e954b623eefcf3925d3b356f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -102,9 +102,11 @@ testFrameworks += new TestFramework("org.scalameter.ScalaMeterFramework")
 
 parallelExecution in Test := false
 
-testOptions in (Test, test) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument(TestFrameworks.ScalaCheck, "-oDF"))
+parallelExecution in (Test, testOnly) := false
 
-testOptions in (Test, testOnly) := Seq(Tests.Argument(TestFrameworks.ScalaCheck, "-oDF"))
+testOptions in (Test, test) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument(TestFrameworks.ScalaTest, "-oDF"))
+
+testOptions in (Test, testOnly) := Seq(Tests.Argument(TestFrameworks.ScalaTest, "-oDF"))
 
 sourcesInBase in Compile := false
 
diff --git a/src/test/scala/leon/test/codegen/CodeGenSuite.scala b/src/test/scala/leon/test/codegen/CodeGenSuite.scala
index a33d868be873f925e6d52bbd859d33f7393cb090..f58cc604b9ef1396a3206e88157d130a6a3ba5ac 100644
--- a/src/test/scala/leon/test/codegen/CodeGenSuite.scala
+++ b/src/test/scala/leon/test/codegen/CodeGenSuite.scala
@@ -272,7 +272,7 @@ class CodeGenSuite extends test.LeonTestSuite {
       case class Conc() extends Ab { }
       def test = { val willNotLoop = Conc(); 42 }
     }
-    object list {
+    object ListWithSize {
       abstract class List[T] {
          val length : Int = this match {
           case Nil() => 0