diff --git a/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala
index c7ceb00d..44e9dc7b 100644
--- a/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala
+++ b/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala
@@ -3,13 +3,13 @@
  */
 package play.twirl.api.test
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.api._
 
 import scala.collection.immutable
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class BufferedContentSpec extends WordSpec with MustMatchers {
+class BufferedContentSpec extends AnyWordSpec with Matchers {
 
   "equality checking" should {
 
diff --git a/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala
index 6994545a..49afdf63 100644
--- a/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala
+++ b/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala
@@ -4,10 +4,10 @@
 package play.twirl.api
 package test
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class FormatSpec extends WordSpec with MustMatchers {
+class FormatSpec extends AnyWordSpec with Matchers {
 
   "Formats" should {
     "show null text values as empty" in {
diff --git a/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala
index 7a1417df..bdc32cde 100644
--- a/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala
+++ b/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala
@@ -8,10 +8,10 @@ import java.util.ArrayList
 import java.util.Optional
 import java.util.{ List => JList }
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class StringInterpolationSpec extends WordSpec with MustMatchers {
+class StringInterpolationSpec extends AnyWordSpec with Matchers {
 
   "StringInterpolation" should {
     "leave string parts untouched" in {
diff --git a/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala b/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala
index 7bec582d..9b7fe566 100644
--- a/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala
+++ b/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala
@@ -6,12 +6,12 @@ package test
 
 import java.io._
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.api.Html
 import play.twirl.parser.TwirlIO
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class CompilerSpec extends WordSpec with MustMatchers {
+class CompilerSpec extends AnyWordSpec with Matchers {
 
   import Helper._
 
diff --git a/compiler/src/test/scala/play/twirl/compiler/test/TemplateUtilsSpec.scala b/compiler/src/test/scala/play/twirl/compiler/test/TemplateUtilsSpec.scala
index f06b8782..f145c625 100644
--- a/compiler/src/test/scala/play/twirl/compiler/test/TemplateUtilsSpec.scala
+++ b/compiler/src/test/scala/play/twirl/compiler/test/TemplateUtilsSpec.scala
@@ -4,13 +4,13 @@
 package play.twirl.compiler
 package test
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.api._
 
 import scala.collection.immutable
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class TemplateUtilsSpec extends WordSpec with MustMatchers {
+class TemplateUtilsSpec extends AnyWordSpec with Matchers {
 
   "Templates" should {
 
diff --git a/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala b/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala
index 3c2cdc7b..9597daed 100644
--- a/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala
+++ b/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala
@@ -5,11 +5,11 @@ package play.twirl.parser
 package test
 
 import org.scalatest.Inside
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.parser.TreeNodes._
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class ParserSpec extends WordSpec with MustMatchers with Inside {
+class ParserSpec extends AnyWordSpec with Matchers with Inside {
 
   val parser = new TwirlParser(shouldParseInclusiveDot = false)
 
diff --git a/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala b/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala
index bdfa91a6..1dd57b06 100644
--- a/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala
+++ b/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala
@@ -5,12 +5,12 @@ package play.twirl.sbt
 package test
 
 import org.scalatest.Inspectors
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.sbt.TemplateProblem.TemplateMapping
 import play.twirl.sbt.TemplateProblem.TemplateMapping.Location
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class TemplateMappingSpec extends WordSpec with MustMatchers with Inspectors {
+class TemplateMappingSpec extends AnyWordSpec with Matchers with Inspectors {
 
   "TemplateMapping" should {
 
diff --git a/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplatePositionSpec.scala b/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplatePositionSpec.scala
index ce5585db..80954d64 100644
--- a/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplatePositionSpec.scala
+++ b/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplatePositionSpec.scala
@@ -8,10 +8,10 @@ import java.io.File
 import play.twirl.sbt.TemplateProblem.TemplateMapping
 import play.twirl.sbt.TemplateProblem.TemplatePosition
 import org.scalatest.Inspectors
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class TemplatePositionSpec extends WordSpec with MustMatchers with Inspectors {
+class TemplatePositionSpec extends AnyWordSpec with Matchers with Inspectors {
 
   "TemplatePosition" should {