diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index ef67a662be..b0b084115f 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -97,7 +97,7 @@ object AkkaBuild extends Build {
     id = "akka-testkit",
     base = file("akka-testkit"),
     dependencies = Seq(actor),
-    settings = defaultSettings ++ Seq(
+    settings = defaultSettings ++ OSGi.testkit ++ Seq(
       libraryDependencies ++= Dependencies.testkit,
       initialCommands += "import akka.testkit._",
       previousArtifact := akkaPreviousArtifact("akka-testkit")
@@ -635,6 +635,8 @@ object AkkaBuild extends Build {
 
     val transactor = exports(Seq("akka.transactor.*"))
 
+    val testkit = exports(Seq("akka.testkit.*"))
+
     val zeroMQ = exports(Seq("akka.zeromq.*"))
 
     def exports(packages: Seq[String] = Seq()) = osgiSettings ++ Seq(