diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt
index 643aceb0..f6e4cfed 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt
@@ -9,6 +9,8 @@ class TestConfig(val project: Project) {
     val testIncludes = arrayListOf("**/*Test.class")
     val testExcludes = arrayListOf<String>()
 
+    var configName: String = ""
+
     fun args(vararg arg: String) {
         testArgs.addAll(arg)
     }
@@ -35,7 +37,12 @@ class TestConfig(val project: Project) {
 @Directive
 fun Project.test(init: TestConfig.() -> Unit) = let { project ->
     with(testConfigs) {
-        clear()
-        add(TestConfig(project).apply { init() })
+        val tf = TestConfig(project).apply { init() }
+        if (! map { it.configName }.contains(tf.configName)) {
+            add(tf)
+        } else {
+            throw KobaltException("Test configuration \"${tf.configName}\" already exists, give it a different "
+                    + "name with test { configName = ... }")
+        }
     }
 }
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestRunnerContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestRunnerContributor.kt
index 52bc9551..b8b860f6 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestRunnerContributor.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestRunnerContributor.kt
@@ -7,8 +7,9 @@ import com.beust.kobalt.TaskResult
  */
 interface ITestRunnerContributor : IContributor, IProjectAffinity {
     /**
-     * Run the project.
+     * Run the tests. If [[configName]] is not empty, a specific test configuration is requested.
      */
-    fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>) : TaskResult
+    fun run(project: Project, context: KobaltContext, configName: String,
+            classpath: List<IClasspathDependency>) : TaskResult
 }
 
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
index 86af8ac6..6d4fe57b 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
@@ -40,7 +40,7 @@ open class Project(
      */
     val projectExtra = ProjectExtra(this)
 
-    val testConfigs = arrayListOf(TestConfig(this))
+    val testConfigs = arrayListOf<TestConfig>()
 
     // If one is specified by default, we only generate a BuildConfig, find a way to fix that
     override var buildConfig : BuildConfig? = null // BuildConfig()
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
index 99acd12e..6d4ca323 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
@@ -16,8 +16,9 @@ abstract class GenericTestRunner : ITestRunnerContributor {
     abstract val mainClass: String
     abstract fun args(project: Project, classpath: List<IClasspathDependency>, testConfig: TestConfig) : List<String>
 
-    override fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>)
-            = TaskResult(runTests(project, classpath))
+    override fun run(project: Project, context: KobaltContext, configName: String,
+            classpath: List<IClasspathDependency>)
+        = TaskResult(runTests(project, classpath, configName))
 
     override fun affinity(project: Project, context: KobaltContext) =
             if (project.testDependencies.any { it.id.contains(dependencyName)}) IAffinity.DEFAULT_POSITIVE_AFFINITY
@@ -45,12 +46,14 @@ abstract class GenericTestRunner : ITestRunnerContributor {
     /**
      * @return true if all the tests passed
      */
-    fun runTests(project: Project, classpath: List<IClasspathDependency>) : Boolean {
+    fun runTests(project: Project, classpath: List<IClasspathDependency>, configName: String) : Boolean {
         val jvm = JavaInfo.create(File(SystemProperties.javaBase))
         val java = jvm.javaExecutable
         var result = false
 
-        project.testConfigs.forEach { testConfig ->
+        val testConfig = project.testConfigs.firstOrNull { it.configName == configName }
+
+        if (testConfig != null) {
             val args = args(project, classpath, testConfig)
             if (args.size > 0) {
                 val allArgs = arrayListOf<String>().apply {
@@ -79,6 +82,8 @@ abstract class GenericTestRunner : ITestRunnerContributor {
                 log(2, "Couldn't find any test classes")
                 result = true
             }
+        } else {
+            throw KobaltException("Couldn't find a test configuration named \"$configName\"")
         }
         return result
     }
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
index 002444a9..02fd09f4 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
@@ -3,6 +3,7 @@ package com.beust.kobalt.internal
 import com.beust.kobalt.IncrementalTaskInfo
 import com.beust.kobalt.KobaltException
 import com.beust.kobalt.TaskResult
+import com.beust.kobalt.TestConfig
 import com.beust.kobalt.api.*
 import com.beust.kobalt.api.annotation.ExportedProjectProperty
 import com.beust.kobalt.api.annotation.IncrementalTask
@@ -68,17 +69,32 @@ open class JvmCompilerPlugin @Inject constructor(
         project.projectProperties.put(DEPENDENT_PROJECTS, projects())
         taskContributor.addIncrementalVariantTasks(this, project, context, "compile",
                 runTask = { taskCompile(project) })
+
+        //
+        // Add each test config as a test task. If none was specified, create a default one so that
+        // users don't have to specify a test{}
+        //
+        if (project.testConfigs.isEmpty()) {
+            project.testConfigs.add(TestConfig(project))
+        }
+        project.testConfigs.forEach { config ->
+            val taskName = if (config.configName.isEmpty()) "test" else "test" + config.configName
+
+            taskManager.addTask(this, project, taskName,
+                    runAfter = listOf(JvmCompilerPlugin.TASK_COMPILE, JvmCompilerPlugin.TASK_COMPILE_TEST),
+                    task = { taskTest(project, config.configName)} )
+        }
+
     }
 
-    @Task(name = TASK_TEST, description = "Run the tests",
-            runAfter = arrayOf(JvmCompilerPlugin.TASK_COMPILE, JvmCompilerPlugin.TASK_COMPILE_TEST))
-    fun taskTest(project: Project): TaskResult {
-        lp(project, "Running tests")
+    private fun taskTest(project: Project, configName: String): TaskResult {
+        lp(project, "Running tests: $configName")
 
         val runContributor = ActorUtils.selectAffinityActor(project, context,
                 context.pluginInfo.testRunnerContributors)
         if (runContributor != null && runContributor.affinity(project, context) > 0) {
-            return runContributor.run(project, context, dependencyManager.testDependencies(project, context))
+            return runContributor.run(project, context, configName, dependencyManager.testDependencies(project,
+                    context))
         } else {
             log(1, "Couldn't find a test runner for project ${project.name}, did you specify a dependenciesTest{}?")
             return TaskResult()