diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3921b19a6..b095729cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,6 +88,10 @@ workflows:
           name: 2.13.4
           java_version: jdk8
           scala_version: 2.13.4
+      - scala_job:
+          name: 3.0.0-M3
+          java_version: jdk8
+          scala_version: 3.0.0-M3
       - scala_job:
           name: 3.0.0-M2
           java_version: jdk8
@@ -103,7 +107,7 @@ workflows:
       - scala_job:
           name: jdk11_3.0
           java_version: jdk11
-          scala_version: 3.0.0-M2
+          scala_version: 3.0.0-M3
       - scala_job:
           name: jdk15_2.12
           java_version: jdk15
@@ -115,7 +119,7 @@ workflows:
       - scala_job:
           name: jdk15_3.0
           java_version: jdk15
-          scala_version: 3.0.0-M2
+          scala_version: 3.0.0-M3
       - scala_job:
           name: jdk16_2.12
           java_version: jdk16
@@ -127,7 +131,7 @@ workflows:
       - scala_job:
           name: jdk16_3.0
           java_version: jdk16
-          scala_version: 3.0.0-M2
+          scala_version: 3.0.0-M3
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.12
diff --git a/.travis.yml b/.travis.yml
index 4f9db8432..ba23b1d7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
+  - 3.0.0-M3
   - 3.0.0-M2
   - 2.12.12
   - 2.13.4
diff --git a/build.sbt b/build.sbt
index c119ef2e6..a392cce29 100644
--- a/build.sbt
+++ b/build.sbt
@@ -37,7 +37,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
       opts.split("\\s+").to[Seq]
     },
 
-    scalacOptions in Test  += "-Xxml:coalescing",
+    Test / scalacOptions  += "-Xxml:coalescing",
 
     // don't run Dottydoc, it errors and isn't needed anyway.
     // but we leave `publishArtifact` set to true, otherwise Sonatype won't let us publish
@@ -159,9 +159,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
     }
   )
   .jsSettings(
-    // The config for Travis has an exclude, but sbt-travisci doesn't catch it.
-    crossScalaVersions -= "3.0.0-M2",
     // Scala.js cannot run forked tests
-    fork in Test := false
+    Test / fork := false
   )
   .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))