diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index b7c3acf6..455eb021 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -14,8 +14,8 @@ jobs:
           - 2.12.20
           - 2.13.14
           - 2.13.15
-          - 3.3.3
-          - 3.5.1
+          - 3.3.4
+          - 3.6.2
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
diff --git a/build.sbt b/build.sbt
index 893b83a3..ed70d904 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,8 +19,8 @@ developers := List(
   )
 )
 
-scalaVersion := "3.5.2"
-crossScalaVersions := Seq("2.12.19", "2.12.20", "2.13.14", "2.13.15", "3.3.4", "3.5.2")
+scalaVersion := "3.6.2"
+crossScalaVersions := Seq("2.12.19", "2.12.20", "2.13.14", "2.13.15", "3.3.4", "3.6.2")
 autoScalaLibrary := false
 crossVersion := CrossVersion.full
 crossTarget := {
@@ -56,7 +56,7 @@ val scalac12Options = scala2Options ++ Seq(
   "254"
 )
 val scala3Options = Seq(
-  "-Ysafe-init",
+  "-Wsafe-init",
   "-Wnonunit-statement",
   "-Wunused:all",
   "-Wvalue-discard",
diff --git a/src/test/scala-3/com/sksamuel/scapegoat/inspections/option/OptionGetTest.scala b/src/test/scala-3/com/sksamuel/scapegoat/inspections/option/OptionGetTest.scala
index 56f0d6d7..6d194f50 100644
--- a/src/test/scala-3/com/sksamuel/scapegoat/inspections/option/OptionGetTest.scala
+++ b/src/test/scala-3/com/sksamuel/scapegoat/inspections/option/OptionGetTest.scala
@@ -1,6 +1,6 @@
 package com.sksamuel.scapegoat.inspections.option
 
-import com.sksamuel.scapegoat.{InspectionTest, Levels, Warning}
+import com.sksamuel.scapegoat.{InspectionTest, Levels}
 
 class OptionGetTest extends InspectionTest(classOf[OptionGet]) {