diff --git a/shared/src/test/scala/org/scalamock/test/scalatest/BasicAsyncTest.scala b/shared/src/test/scala/org/scalamock/test/scalatest/BasicAsyncTest.scala
new file mode 100644
index 00000000..4a517d2f
--- /dev/null
+++ b/shared/src/test/scala/org/scalamock/test/scalatest/BasicAsyncTest.scala
@@ -0,0 +1,40 @@
+// Copyright (c) 2011-2015 ScalaMock Contributors (https://github.com/paulbutcher/ScalaMock/graphs/contributors)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package org.scalamock.test.scalatest
+
+import org.scalamock.scalatest.AsyncMockFactory
+import org.scalatest.{AsyncFlatSpec, Matchers}
+import scala.concurrent.Future
+
+/**
+ *  Tests for issue #215
+ */
+class BasicAsyncTest extends AsyncFlatSpec with Matchers with AsyncMockFactory {
+  trait TestTrait {
+    def foo(): Int
+  }
+
+  "AsyncMockFactory" should "work in scalatest async test" in {
+    val mockedTrait = mock[TestTrait]
+    (() => mockedTrait.foo()).expects().returning(42)
+    Future.successful { mockedTrait.foo() shouldBe 42 }
+  }
+}