diff --git a/CHANGELOG.md b/CHANGELOG.md
index 891c0cc..6d8b6df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 ### Changed
 
 - [Core] Update `cucumber-core` dependency to [7.28.0](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
-- Upgrade Scala versions to 2.12.20
+- Upgrade Scala versions to 2.12.20 and 3.3.6
 
 ### Deprecated
 
diff --git a/build.sbt b/build.sbt
index 76c61f8..a8e2658 100644
--- a/build.sbt
+++ b/build.sbt
@@ -34,7 +34,7 @@ ThisBuild / homepage := Some(
 
 val scala212 = "2.12.20"
 val scala213 = "2.13.16"
-val scala3 = "3.3.1"
+val scala3 = "3.3.6"
 
 scalaVersion := scala213
 
diff --git a/cucumber-scala/src/test/scala-2/io/cucumber/scala/ScalaDslStepsTest.scala b/cucumber-scala/src/test/scala-2/io/cucumber/scala/ScalaDslStepsTest.scala
index a8698e0..c8894a4 100644
--- a/cucumber-scala/src/test/scala-2/io/cucumber/scala/ScalaDslStepsTest.scala
+++ b/cucumber-scala/src/test/scala-2/io/cucumber/scala/ScalaDslStepsTest.scala
@@ -119,7 +119,7 @@ class ScalaDslStepsTest {
       classOf[IncorrectStepDefinitionException],
       "io.cucumber.scala.ScalaDslStepsTest",
       "ScalaDslStepsTest.scala",
-      323,
+      326,
       Array(null)
     )
   }
@@ -226,7 +226,7 @@ class ScalaDslStepsTest {
       classOf[IncorrectStepDefinitionException],
       "io.cucumber.scala.ScalaDslStepsTest",
       "ScalaDslStepsTest.scala",
-      323,
+      326,
       Array(null)
     )
   }
@@ -271,7 +271,10 @@ class ScalaDslStepsTest {
       check: => Boolean
   ): Unit = {
     assertEquals(pattern, stepDefinition.getPattern)
-    assertTrue(stepDefinition.getLocation.contains(location))
+    assertTrue(
+      stepDefinition.getLocation.contains(location),
+      s"Expected location '${stepDefinition.getLocation}' to contain '$location'"
+    )
     stepDefinition.execute(args)
     assertTrue(check)
   }
diff --git a/cucumber-scala/src/test/scala-3/io/cucumber/scala/ScalaDslStepsTest.scala b/cucumber-scala/src/test/scala-3/io/cucumber/scala/ScalaDslStepsTest.scala
index 14ac149..52c283f 100644
--- a/cucumber-scala/src/test/scala-3/io/cucumber/scala/ScalaDslStepsTest.scala
+++ b/cucumber-scala/src/test/scala-3/io/cucumber/scala/ScalaDslStepsTest.scala
@@ -49,7 +49,7 @@ class ScalaDslStepsTest {
     assertClassStepDefinition(
       glue.registry.stepDefinitions.head,
       "Something",
-      "ScalaDslStepsTest.scala:43",
+      "ScalaDslStepsTest.scala:42",
       Array(),
       invoked
     )
@@ -119,7 +119,7 @@ class ScalaDslStepsTest {
       classOf[IncorrectStepDefinitionException],
       "io.cucumber.scala.ScalaDslStepsTest",
       "ScalaDslStepsTest.scala",
-      323,
+      326,
       Array(null)
     )
   }
@@ -162,7 +162,7 @@ class ScalaDslStepsTest {
     assertObjectStepDefinition(
       Glue.registry.stepDefinitions.head,
       "Something",
-      "ScalaDslStepsTest.scala:158",
+      "ScalaDslStepsTest.scala:157",
       Array(),
       invoked
     )
@@ -226,7 +226,7 @@ class ScalaDslStepsTest {
       classOf[IncorrectStepDefinitionException],
       "io.cucumber.scala.ScalaDslStepsTest",
       "ScalaDslStepsTest.scala",
-      323,
+      326,
       Array(null)
     )
   }
@@ -271,7 +271,10 @@ class ScalaDslStepsTest {
       check: => Boolean
   ): Unit = {
     assertEquals(pattern, stepDefinition.getPattern)
-    assertTrue(stepDefinition.getLocation.contains(location))
+    assertTrue(
+      stepDefinition.getLocation.contains(location),
+      s"Expected location '${stepDefinition.getLocation}' to contain '$location'"
+    )
     stepDefinition.execute(args)
     assertTrue(check)
   }