diff --git a/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala b/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala
index b13a61b82f..11bd7f830c 100644
--- a/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala
+++ b/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala
@@ -1,6 +1,6 @@
 package akka.actor
 
-import akka.util.TestKit
+import akka.testkit.TestKit
 import akka.util.duration._
 
 import org.scalatest.WordSpec
diff --git a/akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala b/akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala
index b66b489e2f..e006ba4198 100644
--- a/akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala
+++ b/akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala
@@ -315,7 +315,3 @@ class ExecutorBasedEventDrivenWorkStealingDispatcherModelTest extends ActorModel
   def newInterceptedDispatcher = new ExecutorBasedEventDrivenWorkStealingDispatcher("foo") with MessageDispatcherInterceptor
 }
 
-class CallingThreadDispatcherTest extends ActorModelSpec {
-  def newInterceptedDispatcher = new CallingThreadDispatcher with MessageDispatcherInterceptor
-  override def dispatcherShouldProcessMessagesInParallel {}
-}
diff --git a/akka-actor/src/main/scala/akka/dispatch/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
old mode 100755
new mode 100644
similarity index 96%
rename from akka-actor/src/main/scala/akka/dispatch/CallingThreadDispatcher.scala
rename to akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
index a53d501869..afafd284a5
--- a/akka-actor/src/main/scala/akka/dispatch/CallingThreadDispatcher.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
@@ -1,6 +1,7 @@
-package akka.dispatch
+package akka.testkit
 
 import akka.actor.ActorRef
+import akka.dispatch.{MessageDispatcher, MessageInvocation}
 import java.util.concurrent.locks.ReentrantLock
 import java.util.LinkedList
 import java.util.concurrent.RejectedExecutionException
diff --git a/akka-actor/src/main/scala/akka/util/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
similarity index 99%
rename from akka-actor/src/main/scala/akka/util/TestKit.scala
rename to akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index bb400ff992..a2d26ac4a8 100644
--- a/akka-actor/src/main/scala/akka/util/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@@ -1,8 +1,9 @@
-package akka.util
+package akka.testkit
 
 import akka.actor.{Actor, FSM}
 import Actor._
-import duration._
+import akka.util.Duration
+import akka.util.duration._
 
 import java.util.concurrent.{BlockingDeque, LinkedBlockingDeque, TimeUnit}
 
diff --git a/akka-testkit/src/test/scala/akka/testkit/CallingThreadDispatcherSpec.scala b/akka-testkit/src/test/scala/akka/testkit/CallingThreadDispatcherSpec.scala
new file mode 100644
index 0000000000..c438a8c3d7
--- /dev/null
+++ b/akka-testkit/src/test/scala/akka/testkit/CallingThreadDispatcherSpec.scala
@@ -0,0 +1,11 @@
+package akka.testkit
+
+import akka.actor.dispatch.ActorModelSpec
+
+class CallingThreadDispatcherTest extends ActorModelSpec {
+  import ActorModelSpec._
+  def newInterceptedDispatcher = new CallingThreadDispatcher with MessageDispatcherInterceptor
+  override def dispatcherShouldProcessMessagesInParallel {}
+}
+
+// vim: set ts=4 sw=4 et:
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 94559e5de3..11e9dea171 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -212,6 +212,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   // -------------------------------------------------------------------------------------------------------------------
 
   lazy val akka_actor       = project("akka-actor",       "akka-actor",       new AkkaActorProject(_))
+  lazy val akka_testkit     = project("akka-testkit",     "akka-testkit",     new AkkaTestkitProject(_),    akka_actor)
   lazy val akka_stm         = project("akka-stm",         "akka-stm",         new AkkaStmProject(_),        akka_actor)
   lazy val akka_typed_actor = project("akka-typed-actor", "akka-typed-actor", new AkkaTypedActorProject(_), akka_stm)
   lazy val akka_remote      = project("akka-remote",      "akka-remote",      new AkkaRemoteProject(_),     akka_typed_actor)
@@ -330,8 +331,19 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     val junit           = Dependencies.junit
     val scalatest       = Dependencies.scalatest
     val multiverse_test = Dependencies.multiverse_test // StandardLatch
+
+    // some tests depend on testkit, so include that and make sure it's compiled
+    override def testClasspath = super.testClasspath +++ akka_testkit.path("target") / "classes"
+    override def testCompileAction = super.testCompileAction dependsOn (akka_testkit.compile)
+
   }
 
+  // -------------------------------------------------------------------------------------------------------------------
+  // akka-testkit subproject
+  // -------------------------------------------------------------------------------------------------------------------
+
+  class AkkaTestkitProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath)
+
   // -------------------------------------------------------------------------------------------------------------------
   // akka-stm subproject
   // -------------------------------------------------------------------------------------------------------------------