diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index 818361790a..586eb226f4 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@@ -803,11 +803,11 @@ object TestProbe {
   def apply()(implicit system: ActorSystem) = new TestProbe(system)
 }
 
-trait ImplicitSender { this: TestKit ⇒
+trait ImplicitSender { this: TestKitBase ⇒
   implicit def self = testActor
 }
 
-trait DefaultTimeout { this: TestKit ⇒
+trait DefaultTimeout { this: TestKitBase ⇒
   implicit val timeout: Timeout = testKitSettings.DefaultTimeout
 }
 
diff --git a/akka-testkit/src/test/scala/akka/testkit/ImplicitSenderSpec.scala b/akka-testkit/src/test/scala/akka/testkit/ImplicitSenderSpec.scala
new file mode 100644
index 0000000000..c42fc91bcd
--- /dev/null
+++ b/akka-testkit/src/test/scala/akka/testkit/ImplicitSenderSpec.scala
@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2013-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
+package akka.testkit
+
+import org.scalatest.{ WordSpec, BeforeAndAfterAll }
+import org.scalatest.Matchers
+import akka.actor.ActorSystem
+
+@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
+class ImplicitSenderSpec
+  extends WordSpec with Matchers with BeforeAndAfterAll with TestKitBase with ImplicitSender {
+
+  implicit lazy val system = ActorSystem("AkkaCustomSpec")
+
+  override def afterAll = system.shutdown
+
+  "An ImplicitSender" should {
+    "have testActor as its self" in {
+      self should be(testActor)
+    }
+  }
+}
\ No newline at end of file