diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6a7658b..b490dc56 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,6 +100,10 @@ workflows:
           name: 3.0.2
           java_version: jdk8
           scala_version: 3.0.2
+      - scala_job:
+          name: 3.1.0
+          java_version: jdk8
+          scala_version: 3.1.0
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -112,6 +116,10 @@ workflows:
           name: jdk11_3.0
           java_version: jdk11
           scala_version: 3.0.2
+      - scala_job:
+          name: jdk11_3.1
+          java_version: jdk11
+          scala_version: 3.1.0
       - scala_job:
           name: jdk17_2.12
           java_version: jdk17
@@ -124,6 +132,10 @@ workflows:
           name: jdk17_3.0
           java_version: jdk17
           scala_version: 3.0.2
+      - scala_job:
+          name: jdk17_3.1
+          java_version: jdk17
+          scala_version: 3.1.0
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.15
@@ -133,6 +145,9 @@ workflows:
       - scalajs_job:
           name: sjs1.0_3
           scala_version: 3.0.2
+      - scalajs_job:
+          name: sjs1.0_3.1
+          scala_version: 3.1.0
       - scalanative_job:
           name: native0.4_2.12
           scala_version: 2.12.15
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a06efc26..b12acfcb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [8, 11, 17]
-        scala: [2.12.15, 2.13.6, 3.0.2]
+        scala: [2.12.15, 2.13.6, 3.0.2, 3.1.0]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/build.sbt b/build.sbt
index a0212a32..8c019f4b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -35,9 +35,15 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
     name    := "scala-xml",
     scalaModuleAutomaticModuleName := Some("scala.xml"),
-    crossScalaVersions := Seq("2.13.6", "2.12.15", "3.0.2"),
+    crossScalaVersions := Seq("2.13.6", "2.12.15", "3.0.2", "3.1.0"),
     scalaVersion := "2.12.15",
 
+    // Don't publish for Scala 3.1 or later, only from 3.0
+    publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((3, x)) if x > 0 => true
+      case _                     => false
+    }),
+
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) =>
         Seq("-language:Scala2")