diff --git a/main/Defaults.scala b/main/Defaults.scala
index fd7e43b73..d62f3e913 100644
--- a/main/Defaults.scala
+++ b/main/Defaults.scala
@@ -287,6 +287,7 @@ object Defaults extends BuildCommon
 		testOptions in GlobalScope :== Nil,
 		testExecution in test <<= testExecutionTask(test),
 		testExecution in testOnly <<= testExecutionTask(testOnly),
+		testFilter in testOnly :== (selectedFilter _),
 		executeTests <<= (streams in test, loadedTestFrameworks, testExecution in test, testLoader, definedTests, resolvedScoped, state) flatMap {
 			(s, frameworkMap, config, loader, discovered, scoped, st) =>
 				implicit val display = Project.showContextKey(st)
@@ -323,19 +324,22 @@ object Defaults extends BuildCommon
 	def testExecutionTask(task: Scoped): Initialize[Task[Tests.Execution]] =
 			(testOptions in task, parallelExecution in task, tags in task) map { (opts, par, ts) => new Tests.Execution(opts, par, ts) }
 
-	def testOnlyTask =
-	InputTask( loadForParser(definedTestNames)( (s, i) => testOnlyParser(s, i getOrElse Nil) ) ) { result =>
-		(streams, loadedTestFrameworks, testExecution in testOnly, testLoader, definedTests, resolvedScoped, result, state) flatMap {
-			case (s, frameworks, config, loader, discovered, scoped, (tests, frameworkOptions), st) =>
-				val filter = selectedFilter(tests)
-				val modifiedOpts = Tests.Filter(filter) +: Tests.Argument(frameworkOptions : _*) +: config.options
-				val newConfig = new Tests.Execution(modifiedOpts, config.parallel, config.tags)
-				implicit val display = Project.showContextKey(st)
-				Tests(frameworks, loader, discovered, newConfig, noTestsMessage(scoped), s.log) map { results =>
-					Tests.showResults(s.log, results)
-				}
+	def testOnlyTask: Initialize[InputTask[Unit]] = inputTests(testOnly)
+
+	def inputTests(key: InputKey[_]): Initialize[InputTask[Unit]] =
+		InputTask( loadForParser(definedTestNames)( (s, i) => testOnlyParser(s, i getOrElse Nil) ) ) { result =>
+			(streams, loadedTestFrameworks, testFilter in key, testExecution in key, testLoader, definedTests, resolvedScoped, result, state) flatMap {
+				case (s, frameworks, filter, config, loader, discovered, scoped, (tests, frameworkOptions), st) =>
+					val modifiedOpts = Tests.Filter(filter(tests)) +: Tests.Argument(frameworkOptions : _*) +: config.options
+					val newConfig = new Tests.Execution(modifiedOpts, config.parallel, config.tags)
+					implicit val display = Project.showContextKey(st)
+					Tests(frameworks, loader, discovered, newConfig, noTestsMessage(scoped), s.log) map { results =>
+						Tests.showResults(s.log, results)
+				  }
+			}
 		}
-	}
+																																																
+
 	def selectedFilter(args: Seq[String]): String => Boolean =
 	{
 		val filters = args map GlobFilter.apply
diff --git a/main/Keys.scala b/main/Keys.scala
index eeed6e3a9..c5ba0fa9c 100644
--- a/main/Keys.scala
+++ b/main/Keys.scala
@@ -196,6 +196,7 @@ object Keys
 	val testFrameworks = SettingKey[Seq[TestFramework]]("test-frameworks", "Registered, although not necessarily present, test frameworks.")
 	val testListeners = TaskKey[Seq[TestReportListener]]("test-listeners", "Defines test listeners.")
 	val testExecution = TaskKey[Tests.Execution]("test-execution", "Settings controlling test execution")
+	val testFilter = TaskKey[Seq[String] => String => Boolean]("test-filter", "Filter controlling whether the test is executed")
 	val isModule = AttributeKey[Boolean]("is-module", "True if the target is a module.")
 
 	// Classpath/Dependency Management Keys