diff --git a/build.sbt b/build.sbt
index f969b8099..6f4cc252a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -10,7 +10,7 @@ ThisBuild / version := "2.16.0-SNAPSHOT"
 
 ThisBuild / scalaVersion := "2.13.10"
 
-ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.17", "2.13.10", "3.2.2")
+ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.17", "2.13.10", "3.3.0")
 
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
diff --git a/src/test/scala-2.+/com/fasterxml/jackson/module/scala/ser/AnyValScala2SerializerTest.scala b/src/test/scala/com/fasterxml/jackson/module/scala/ser/AnyVal2SerializerTest.scala
similarity index 96%
rename from src/test/scala-2.+/com/fasterxml/jackson/module/scala/ser/AnyValScala2SerializerTest.scala
rename to src/test/scala/com/fasterxml/jackson/module/scala/ser/AnyVal2SerializerTest.scala
index 14973e0b8..565e3fdac 100644
--- a/src/test/scala-2.+/com/fasterxml/jackson/module/scala/ser/AnyValScala2SerializerTest.scala
+++ b/src/test/scala/com/fasterxml/jackson/module/scala/ser/AnyVal2SerializerTest.scala
@@ -18,7 +18,7 @@ object AnyValScala2SerializerTest {
   case class LBD(values: List[BD])
 }
 
-//see AnyValSerializerTest for cases that also work with Scala3
+//see also AnyValSerializerTest
 class AnyValScala2SerializerTest extends BaseFixture {
   import AnyValScala2SerializerTest._
 
diff --git a/src/test/scala/com/fasterxml/jackson/module/scala/ser/AnyValSerializerTest.scala b/src/test/scala/com/fasterxml/jackson/module/scala/ser/AnyValSerializerTest.scala
index 78aaf3845..f87a58332 100644
--- a/src/test/scala/com/fasterxml/jackson/module/scala/ser/AnyValSerializerTest.scala
+++ b/src/test/scala/com/fasterxml/jackson/module/scala/ser/AnyValSerializerTest.scala
@@ -10,7 +10,7 @@ object AnyValSerializerTest {
   case class BigIntAnyValHolder(value: BigIntAnyVal)
 }
 
-//see AnyValScala2SerializerTest for cases that only work with Scala2
+//see AnyVal2SerializerTest for cases that only work with Scala2 and Scala3.3 but not earlier versions of Scala3
 class AnyValSerializerTest extends BaseFixture {
   import AnyValSerializerTest._
 
diff --git a/src/test/scala-2.+/com/fasterxml/jackson/module/scala/ser/JsonValueScala2Test.scala b/src/test/scala/com/fasterxml/jackson/module/scala/ser/JsonValueTest.scala
similarity index 77%
rename from src/test/scala-2.+/com/fasterxml/jackson/module/scala/ser/JsonValueScala2Test.scala
rename to src/test/scala/com/fasterxml/jackson/module/scala/ser/JsonValueTest.scala
index 7b5ad3f44..879933445 100644
--- a/src/test/scala-2.+/com/fasterxml/jackson/module/scala/ser/JsonValueScala2Test.scala
+++ b/src/test/scala/com/fasterxml/jackson/module/scala/ser/JsonValueTest.scala
@@ -6,12 +6,13 @@ import com.fasterxml.jackson.module.scala.DefaultScalaModule
 
 import scala.annotation.meta.getter
 
-object JsonValueScala2Test {
+object JsonValueTest {
   case class ValueClass(@(JsonValue @getter) value: String)
 }
 
-class JsonValueScala2Test extends SerializerTest {
-  import JsonValueScala2Test._
+// does not work with Scala3 prior to 3.3.0
+class JsonValueTest extends SerializerTest {
+  import JsonValueTest._
 
   override def module: Module = DefaultScalaModule