diff --git a/scalatest/shared/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala b/scalatest/js/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala
similarity index 90%
rename from scalatest/shared/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala
rename to scalatest/js/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala
index 8c385ed..8779021 100644
--- a/scalatest/shared/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala
+++ b/scalatest/js/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala
@@ -19,7 +19,6 @@ package cats.effect.testing.scalatest
 import cats.effect.IO
 import cats.effect.testing.RuntimePlatform
 import cats.effect.unsafe.IORuntime
-
 import org.scalactic.source.Position
 import org.scalatest.AsyncTestSuite
 import org.scalatest.enablers.Retrying
@@ -32,7 +31,7 @@ trait AsyncIOSpec extends AssertingSyntax with EffectTestSupport with RuntimePla
   implicit def ioRetrying[T]: Retrying[IO[T]] = new Retrying[IO[T]] {
     override def retry(timeout: Span, interval: Span, pos: Position)(fun: => IO[T]): IO[T] =
       IO.fromFuture(
-        IO(Retrying.retryingNatureOfFutureT[T](executionContext).retry(timeout, interval, pos)(fun.unsafeToFuture())),
+        IO(Retrying.retryingNatureOfFutureT[T](IORuntime.global.compute).retry(timeout, interval, pos)(fun.unsafeToFuture())),
       )
   }
 }
diff --git a/scalatest/jvm/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala b/scalatest/jvm/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala
new file mode 100644
index 0000000..5831d5a
--- /dev/null
+++ b/scalatest/jvm/src/main/scala/cats/effect/testing/scalatest/AsyncIOSpec.scala
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 Typelevel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cats.effect.testing.scalatest
+
+import cats.effect.IO
+import cats.effect.testing.RuntimePlatform
+import cats.effect.unsafe.IORuntime
+import org.scalactic.source.Position
+import org.scalatest.AsyncTestSuite
+import org.scalatest.enablers.Retrying
+import org.scalatest.time.Span
+
+trait AsyncIOSpec extends AssertingSyntax with EffectTestSupport with RuntimePlatform { asyncTestSuite: AsyncTestSuite =>
+
+  implicit lazy val ioRuntime: IORuntime = IORuntime.global
+
+  implicit def ioRetrying[T]: Retrying[IO[T]] = new Retrying[IO[T]] {
+    override def retry(timeout: Span, interval: Span, pos: Position)(fun: => IO[T]): IO[T] =
+      IO.fromFuture(
+        IO(Retrying.retryingNatureOfFutureT[T](IORuntime.global.compute).retry(timeout, interval, pos)(fun.unsafeToFuture())),
+      )
+  }
+}
diff --git a/scalatest/jvm/src/test/scala/cats/effect/testing/scalatest/DeadlockTest.scala b/scalatest/jvm/src/test/scala/cats/effect/testing/scalatest/DeadlockTest.scala
new file mode 100644
index 0000000..a8a9815
--- /dev/null
+++ b/scalatest/jvm/src/test/scala/cats/effect/testing/scalatest/DeadlockTest.scala
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Typelevel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cats.effect.testing.scalatest
+
+import cats.effect.IO
+import org.scalatest.freespec.AsyncFreeSpec
+
+class DeadlockTest extends AsyncFreeSpec with AsyncIOSpec {
+
+  "should not deadlock" in {
+    IO.blocking {}.unsafeRunSync()
+    succeed
+  }
+
+}
\ No newline at end of file