diff --git a/build.sbt b/build.sbt
index 89ea39b..ee654cc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -10,8 +10,8 @@ name := "docker-testkit-munit"
 testFrameworks += new TestFramework("munit.Framework")
 fork in Test := true
 
-val munit          = "org.scalameta" %% "munit" % "[0.2.0,)" % Provided // scala-steward:off
-val testKitVersion = "0.9.9"
+val munit          = "org.scalameta" %% "munit" % "1.0.0-M1" % Provided // scala-steward:off
+val testKitVersion = "0.11.0-beta1"
 
 libraryDependencies += munit
 
diff --git a/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala b/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala
index c600609..f31d102 100644
--- a/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala
+++ b/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala
@@ -80,16 +80,16 @@ class DependencyGraphReadyCheckSpec extends FunSuite with DockerKitSpotify {
     } catch {
       case e: RuntimeException => log.error("Test failed during readychecks", e)
     } finally {
-      Await.ready(containerManager.stopRmAll(), StopContainersTimeout)
+      Await.ready(containerManager.stopRmAll(StopContainersTimeout), StopContainersTimeout)
       ()
     }
   }
 
   override def startAllOrFail(): Unit = {
-    Await.result(containerManager.pullImages(), PullImagesTimeout)
+    Await.result(containerManager.pullImages(PullImagesTimeout), PullImagesTimeout)
     containerManager.initReadyAll(StartContainersTimeout).map(_.map(_._2).forall(identity))
     sys.addShutdownHook {
-      containerManager.stopRmAll()
+      containerManager.stopRmAll(StopContainersTimeout)
       ()
     }
     ()
diff --git a/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala b/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala
index 544cb8f..13373c4 100644
--- a/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala
+++ b/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala
@@ -21,6 +21,9 @@ import com.whisk.docker.impl.dockerjava._
 import com.whisk.docker.impl.spotify._
 import _root_.munit.FunSuite
 
+import scala.concurrent.duration._
+import scala.language.postfixOps
+
 abstract class DockerContainerLinkingSpec extends FunSuite with DockerTestKit {
 
   lazy val cmdExecutor = implicitly[DockerCommandExecutor]
@@ -37,6 +40,9 @@ abstract class DockerContainerLinkingSpec extends FunSuite with DockerTestKit {
   override def dockerContainers = pingService :: pongService :: super.dockerContainers
 
   test("A DockerContainer should be linked to the specified containers upon start") {
+
+    implicit val InspectTimeout = 3 seconds
+
     val ping     = cmdExecutor.inspectContainer(pingName)
     val pongPing = cmdExecutor.inspectContainer(s"$pongName/$pingAlias")
 
diff --git a/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala b/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala
index 6a5297e..381cc1b 100644
--- a/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala
+++ b/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala
@@ -20,6 +20,9 @@ import com.whisk.docker._
 import com.whisk.docker.impl.dockerjava.DockerKitDockerJava
 import _root_.munit.FunSuite
 
+import scala.concurrent.duration._
+import scala.language.postfixOps
+
 class ElasticsearchServiceSpec
     extends FunSuite
     with DockerElasticsearchService
@@ -27,6 +30,8 @@ class ElasticsearchServiceSpec
     with DockerKitDockerJava {
 
   test("elasticsearch container should be ready") {
+    implicit val ContainerReadyTimeout = 3 seconds
+
     isContainerReady(elasticsearchContainer).map(assert(_))
     elasticsearchContainer.getPorts().map(m => assert(m.get(9300).nonEmpty))
     elasticsearchContainer.getIpAddresses().map(s => assert(s.nonEmpty))
diff --git a/src/test/scala/docker/munit/MongodbServiceSpec.scala b/src/test/scala/docker/munit/MongodbServiceSpec.scala
index 5c5a73c..d449b74 100644
--- a/src/test/scala/docker/munit/MongodbServiceSpec.scala
+++ b/src/test/scala/docker/munit/MongodbServiceSpec.scala
@@ -20,6 +20,9 @@ import com.whisk.docker._
 import com.whisk.docker.impl.spotify.DockerKitSpotify
 import _root_.munit.FunSuite
 
+import scala.concurrent.duration._
+import scala.language.postfixOps
+
 class MongodbServiceSpec
     extends FunSuite
     with DockerTestKit
@@ -27,6 +30,8 @@ class MongodbServiceSpec
     with DockerMongodbService {
 
   test("mongodb node should be ready with log line checker") {
+    implicit val ContainerReadyTimeout = 3 seconds
+
     isContainerReady(mongodbContainer).map(assert(_))
     mongodbContainer.getPorts().map(m => assert(m.get(27017).nonEmpty))
     mongodbContainer.getIpAddresses().map(s => assert(s.nonEmpty))