diff --git a/sbt/src/sbt-test/launcher/locks/build.sbt b/sbt/src/sbt-test/launcher/locks/build.sbt
new file mode 100644
index 000000000..30e3e78ae
--- /dev/null
+++ b/sbt/src/sbt-test/launcher/locks/build.sbt
@@ -0,0 +1 @@
+libraryDependencies += "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test"
diff --git a/launch/src/test/scala/LocksTest.scala b/sbt/src/sbt-test/launcher/locks/src/test/scala/LocksTest.scala
similarity index 100%
rename from launch/src/test/scala/LocksTest.scala
rename to sbt/src/sbt-test/launcher/locks/src/test/scala/LocksTest.scala
diff --git a/sbt/src/sbt-test/launcher/locks/test b/sbt/src/sbt-test/launcher/locks/test
new file mode 100644
index 000000000..dfffb838b
--- /dev/null
+++ b/sbt/src/sbt-test/launcher/locks/test
@@ -0,0 +1 @@
+> test
diff --git a/util/log/src/test/scala/LogWriterTest.scala b/util/log/src/test/scala/LogWriterTest.scala
index 6d01341a0..95736d524 100644
--- a/util/log/src/test/scala/LogWriterTest.scala
+++ b/util/log/src/test/scala/LogWriterTest.scala
@@ -20,7 +20,7 @@ object LogWriterTest extends Properties("Log Writer")
 	property("properly logged") = forAll { (output: Output, newLine: NewLine) =>
 		import output.{lines, level}
 		val log = new RecordingLogger
-		val writer = new LoggerWriter(log, level, newLine.str)
+		val writer = new LoggerWriter(log, Some(level), newLine.str)
 		logLines(writer, lines, newLine.str)
 		val events = log.getEvents
 		 ("Recorded:\n" + events.map(show).mkString("\n")) |: