diff --git a/src/main/scala/scala/tools/partest/nest/SBTRunner.scala b/src/main/scala/scala/tools/partest/nest/SBTRunner.scala
index acc956f..771678a 100644
--- a/src/main/scala/scala/tools/partest/nest/SBTRunner.scala
+++ b/src/main/scala/scala/tools/partest/nest/SBTRunner.scala
@@ -9,19 +9,10 @@
 package scala.tools.partest
 package nest
 
-import sbt.testing.EventHandler
-import sbt.testing.Logger
-import sbt.testing.Event
-import sbt.testing.Fingerprint
-import sbt.testing.Selector
-import sbt.testing.Status
-import sbt.testing.OptionalThrowable
-import sbt.testing.SuiteSelector
-import sbt.testing.TestSelector
+import _root_.sbt.testing._
 import java.net.URLClassLoader
 import TestState._
 
-// called reflectively from scala-partest-test-interface
 class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger],
     srcDir: String, testClassLoader: URLClassLoader, javaCmd: File, javacCmd: File, scalacArgs: Array[String], args: Array[String])
     extends AbstractRunner(args.filter(a => !a.startsWith("-D")).mkString(" ")) {
diff --git a/src/main/scala/scala/tools/partest/sbt/Framework.scala b/src/main/scala/scala/tools/partest/sbt/Framework.scala
new file mode 100644
index 0000000..489dae6
--- /dev/null
+++ b/src/main/scala/scala/tools/partest/sbt/Framework.scala
@@ -0,0 +1,54 @@
+package scala.tools.partest.sbt
+
+import scala.tools.partest.nest.SBTRunner
+import _root_.sbt.testing._
+import java.net.URLClassLoader
+import java.io.File
+
+object Framework {
+  // as partest is not driven by test classes discovered by sbt, need to add this marker fingerprint to definedTests
+  val fingerprint = new AnnotatedFingerprint { def isModule = true; def annotationName = "partest" }
+
+  // TODO how can we export `fingerprint` so that a user can just add this to their build.sbt
+  // definedTests in Test += new sbt.TestDefinition("partest", fingerprint, true, Array())
+}
+class Framework extends sbt.testing.Framework {
+  def fingerprints: Array[Fingerprint] = Array(Framework.fingerprint)
+  def name: String = "partest"
+
+  def runner(args: Array[String], remoteArgs: Array[String], testClassLoader: ClassLoader): Runner =
+    new PartestRunner(args, remoteArgs, testClassLoader)
+}
+
+// We don't use sbt's Runner or Task abstractions properly.
+// sbt runs a single dummy fingerprint match and partest does everything else internally.
+case class PartestRunner(args: Array[String], remoteArgs: Array[String], testClassLoader: ClassLoader) extends Runner {
+  def tasks(taskDefs: Array[TaskDef]): Array[Task] = taskDefs map (PartestTask(_, args): Task)
+  def done(): String = "" // no summary
+}
+
+/** Run partest in this VM. Assumes we're running in a forked VM!
+  */
+case class PartestTask(taskDef: TaskDef, args: Array[String]) extends Task {
+  /** Executes this task, possibly returning to the client new tasks to execute. */
+  def execute(eventHandler: EventHandler, loggers: Array[Logger]): Array[Task] = {
+    val forkedCp    = scala.util.Properties.javaClassPath
+    val classLoader = new URLClassLoader(forkedCp.split(java.io.File.pathSeparator).map(new File(_).toURI.toURL))
+    val runner      = new SBTRunner(taskDef.fingerprint(), eventHandler, loggers, "files", classLoader, null, null, Array.empty[String], args)
+
+    if (Runtime.getRuntime().maxMemory() / (1024*1024) < 800)
+      loggers foreach (_.warn(s"""Low heap size detected (~ ${Runtime.getRuntime().maxMemory() / (1024*1024)}M). Please add the following to your build.sbt: javaOptions in Test += "-Xmx1G""""))
+
+    try runner.run
+    catch {
+      case ex: ClassNotFoundException =>
+        loggers foreach { l => l.error("Please make sure partest is running in a forked VM by including the following line in build.sbt:\nfork in Test := true") }
+        throw ex
+    }
+
+    Array()
+  }
+
+  /** A possibly zero-length array of string tags associated with this task. */
+  def tags: Array[String] = Array()
+}