diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1a620c5f..3766fde9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -20,7 +20,7 @@ jobs:
           # cover relevant combinations when combined with the matrix Yugabyte tests
           # { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test"}
           - { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
-          - { scalaVersion: "3.3",  jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
+          - { scalaVersion: "3.3",  jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
           - { scalaVersion: "2.13", jdkVersion: "1.21.0", jvmName: "temurin:1.21", extraOpts: '', testCmd: "test"}
     steps:
       - name: Checkout
@@ -79,7 +79,7 @@ jobs:
           # cover relevant combinations when combined with the matrix Postgres tests
           - { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test" }
           # { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test" }
-          - { scalaVersion: "3.3",  jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
+          - { scalaVersion: "3.3",  jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
     steps:
       - name: Checkout
         # https://github.com/actions/checkout/releases
@@ -138,7 +138,7 @@ jobs:
         include:
           - { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test"}
           - { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
-          - { scalaVersion: "3.3",  jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
+          - { scalaVersion: "3.3",  jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
           - { scalaVersion: "2.13", jdkVersion: "1.21.0", jvmName: "temurin:1.21", extraOpts: '', testCmd: "test"}
     steps:
       - name: Checkout
diff --git a/build.sbt b/build.sbt
index 54577bdb..1de82e27 100644
--- a/build.sbt
+++ b/build.sbt
@@ -38,7 +38,7 @@ inThisBuild(
 
 def common: Seq[Setting[_]] =
   Seq(
-    crossScalaVersions := Dependencies.Scala2Versions,
+    crossScalaVersions := Dependencies.ScalaVersions,
     scalaVersion := Dependencies.Scala213,
     crossVersion := CrossVersion.binary,
     scalafmtOnCompile := true,
@@ -91,7 +91,6 @@ def suffixFileFilter(suffix: String): FileFilter = new SimpleFileFilter(f => f.g
 
 lazy val core = (project in file("core"))
   .settings(common)
-  .settings(Scala3.settings)
   .settings(name := "akka-persistence-r2dbc", libraryDependencies ++= Dependencies.core)
   .enablePlugins(AutomateHeaderPlugin)
   .disablePlugins(CiReleasePlugin)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c8ba0ca1..d6a1e1ed 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,7 +11,7 @@ object Dependencies {
   val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3
   val AkkaVersion = System.getProperty("override.akka.version", "2.9.2")
   val AkkaVersionInDocs = AkkaVersion.take(3)
-  val AkkaPersistenceJdbcVersion = "5.2.0" // only in migration tool tests
+  val AkkaPersistenceJdbcVersion = "5.4.0" // only in migration tool tests
   val AkkaProjectionVersionInDocs = "current"
   val H2Version = "2.2.224"
   val R2dbcH2Version = "1.0.0.RELEASE"
@@ -72,7 +72,9 @@ object Dependencies {
 
   val migrationTests =
     Seq(
-      "com.lightbend.akka" %% "akka-persistence-jdbc" % AkkaPersistenceJdbcVersion % Test,
+      ("com.lightbend.akka" %% "akka-persistence-jdbc" % AkkaPersistenceJdbcVersion % Test)
+        // Unsupported SLF4J 2 transitively pulled in by Slick 3.5.0
+        .exclude("org.slf4j", "slf4j-api"),
       "com.microsoft.sqlserver" % "mssql-jdbc" % SqlServerJdbcVersion % Test,
       TestDeps.postgresql,
       TestDeps.logback,
diff --git a/project/Scala3.scala b/project/Scala3.scala
deleted file mode 100644
index 339150b6..00000000
--- a/project/Scala3.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import sbt.Keys.crossScalaVersions
-
-object Scala3 {
-
-  val settings = Seq(crossScalaVersions := Dependencies.ScalaVersions)
-
-}