diff --git a/.travis.yml b/.travis.yml
index a832d45ac..4def935c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,12 @@ jobs:
         - SCALA_VERSION=3.0.0-M3
         - TRAVIS_JDK=8
 
+    - name: "Run tests with Scala 3 and AdoptOpenJDK 8"
+      script: scripts/test-code.sh
+      env:
+        - SCALA_VERSION=3.0.0-RC1
+        - TRAVIS_JDK=8
+
     - stage: publish
       name: "Publish artifacts to Bintray"
       script: sbt +publish
diff --git a/build.sbt b/build.sbt
index a4833d3cc..8176afcbc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -123,7 +123,7 @@ lazy val commonSettings = Def.settings(
   ),
   headerLicense := Some(HeaderLicense.Custom(s"Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>")),
   scalaVersion := Dependencies.Scala212,
-  crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213, Dependencies.Scala3),
+  crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213) ++ Dependencies.Scala3
   javacOptions in Compile ++= javacSettings,
   javacOptions in Test ++= javacSettings,
   javacOptions in (Compile, compile) ++= Seq("-target", "1.8"), // sbt #1785, avoids passing to javadoc
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 047700f22..5bc39acde 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,5 +2,5 @@ object Dependencies {
   // scalaVersion needs to be kept in sync with travis-ci
   val Scala212 = "2.12.13"
   val Scala213 = "2.13.4"
-  val Scala3   = "3.0.0-M3"
+  val Scala3   = Seq("3.0.0-M3", "3.0.0-RC1")
 }
diff --git a/project/build.properties b/project/build.properties
index d91c272d4..0b2e09c5a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.4.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e26454966..0d19c192d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -23,4 +23,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.1")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")