diff --git a/sbt/src/main/scala/sbt/DefaultProject.scala b/sbt/src/main/scala/sbt/DefaultProject.scala
index 95d5556f3..6ca5c65a7 100644
--- a/sbt/src/main/scala/sbt/DefaultProject.scala
+++ b/sbt/src/main/scala/sbt/DefaultProject.scala
@@ -301,7 +301,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def packageProjectAction = zipTask(packageProjectPaths, packageProjectZip) describedAs ProjectPackageDescription
 
 	protected def docAllAction = (doc && docTest) describedAs DocAllDescription
-	protected def packageAllAction = Empty dependsOn(`package`, packageTest, packageSrc, packageTestSrc, packageDocs) describedAs PackageAllDescription
+	protected def packageAllAction = task { None} dependsOn(`package`, packageTest, packageSrc, packageTestSrc, packageDocs) describedAs PackageAllDescription
 	protected def graphSourcesAction = graphSourcesTask(graphSourcesPath, mainSourceRoots, mainCompileConditional.analysis).dependsOn(compile)
 	protected def graphPackagesAction = graphPackagesTask(graphPackagesPath, mainSourceRoots, mainCompileConditional.analysis).dependsOn(compile)
 	protected def incrementVersionAction = task { incrementVersionNumber(); None } describedAs IncrementVersionDescription
diff --git a/sbt/src/main/scala/sbt/ScalaProject.scala b/sbt/src/main/scala/sbt/ScalaProject.scala
index 438e6904b..9bdf9fb6c 100644
--- a/sbt/src/main/scala/sbt/ScalaProject.scala
+++ b/sbt/src/main/scala/sbt/ScalaProject.scala
@@ -174,8 +174,8 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			val beginTasks = begin.map(toTask).toSeq // test setup tasks
 			val workTasks = work.map(w => toTask(w) dependsOn(beginTasks : _*)) // the actual tests
 			val endTasks = end.map(toTask).toSeq // tasks that perform test cleanup and are run regardless of success of tests
-			val endTask = Empty named("test-cleanup") dependsOn(endTasks : _*)
-			val rootTask = Empty named("test-complete") dependsOn(workTasks.toSeq : _*) // the task that depends on all test subtasks
+			val endTask = task { None} named("test-cleanup") dependsOn(endTasks : _*)
+			val rootTask = task { None} named("test-complete") dependsOn(workTasks.toSeq : _*) // the task that depends on all test subtasks
 			SubWork[Project#Task](rootTask, endTask)
 		}
 		def errorTask(e: TestSetupException) = task { Some(e.getMessage) } named("test-setup")
diff --git a/sbt/src/main/scala/sbt/TaskManager.scala b/sbt/src/main/scala/sbt/TaskManager.scala
index 040b46c01..8977c728f 100644
--- a/sbt/src/main/scala/sbt/TaskManager.scala
+++ b/sbt/src/main/scala/sbt/TaskManager.scala
@@ -98,7 +98,6 @@ trait TaskManager{
 		val interactiveDependencyIndex = dependencyList.findIndexOf(_.interactive)
 		require(interactiveDependencyIndex < 0, "Dependency (at index " + interactiveDependencyIndex + ") is interactive.  Interactive tasks cannot be dependencies.")
 	}
-	lazy val Empty = task { None}
 }
 object TaskManager
 {