diff --git a/build.sbt b/build.sbt
index d0470fa87ad3446a2e2a3ddf6b71855f1fae689c..de3d691fc5c29fd3e414b31bd3c64fb5c950ae8b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -40,6 +40,7 @@ javaOptions in Test ++= Seq("-Xss32M", "-Xmx4G", "-XX:MaxPermSize=128M")
 parallelExecution in Test := false
 
 testOptions in (Test, test) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument("-oDF"))
+
 testOptions in (Test, testOnly) := Seq(Tests.Argument("-oDF"))
 
 sourcesInBase in Compile := false
diff --git a/src/main/scala/leon/datagen/NaiveDataGen.scala b/src/main/scala/leon/datagen/NaiveDataGen.scala
index 81f50f65b20cb58fa2f0675c5861055a6769b6f0..518ae95d47c0fc6d2e80db31c413888d453ed431 100644
--- a/src/main/scala/leon/datagen/NaiveDataGen.scala
+++ b/src/main/scala/leon/datagen/NaiveDataGen.scala
@@ -16,7 +16,7 @@ import scala.collection.mutable.{Map=>MutableMap}
 /** Utility functions to generate values of a given type.
   * In fact, it could be used to generate *terms* of a given type,
   * e.g. by passing trees representing variables for the "bounds". */
-@deprecated("3.4", "NaiveDataGen is deprecated, use GrammarDataGen with ValueGrammar")
+@deprecated("Stream-based datagen is deprecated, use GrammarDataGen with ValueGrammar instead", "3.0")
 class NaiveDataGen(ctx: LeonContext, p: Program, evaluator: Evaluator, _bounds : Option[Map[TypeTree,Seq[Expr]]] = None) extends DataGenerator {
 
   val bounds = _bounds.getOrElse(Map())