diff --git a/bin/test-release.sh b/bin/test-release.sh
index f0acb9408..c1ce57baa 100755
--- a/bin/test-release.sh
+++ b/bin/test-release.sh
@@ -6,7 +6,7 @@ version=$1
 scala212=2.12.20
 scala213=2.13.16
 scala3LTS=3.3.6
-scala3Next=3.7.0
+scala3Next=3.7.1
 
 cs resolve \
   ch.epfl.scala:scalafix-interfaces:$version  \
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 011709106..a6e09d562 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -10,7 +10,7 @@ object Dependencies {
   val scala33 = "3.3.6"
   val scala35 = "3.5.2"
   val scala36 = "3.6.4"
-  val scala37 = "3.7.0"
+  val scala37 = "3.7.1"
   val scala3LTS = scala33
   val scala3Next = sys.props.getOrElse("scala3.nightly", scala37)
 
diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
index 084ef6efb..bf9044aea 100644
--- a/project/ScalafixBuild.scala
+++ b/project/ScalafixBuild.scala
@@ -244,6 +244,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
   )
 
   private val PreviousScalaVersion: Map[String, Option[String]] = Map(
+    scala37 -> Some("3.7.0")
   )
 
   override def buildSettings: Seq[Setting[_]] = List(
diff --git a/scalafix-tests/input/src/main/scala/test/explicitResultTypes/EnumerationValue.scala b/scalafix-tests/input/src/main/scala-2/test/explicitResultTypes/EnumerationValue.scala
similarity index 100%
rename from scalafix-tests/input/src/main/scala/test/explicitResultTypes/EnumerationValue.scala
rename to scalafix-tests/input/src/main/scala-2/test/explicitResultTypes/EnumerationValue.scala
diff --git a/scalafix-tests/input/src/main/scala/test/explicitResultTypes/ExplicitResultTypesNil.scala b/scalafix-tests/input/src/main/scala-2/test/explicitResultTypes/ExplicitResultTypesNil.scala
similarity index 100%
rename from scalafix-tests/input/src/main/scala/test/explicitResultTypes/ExplicitResultTypesNil.scala
rename to scalafix-tests/input/src/main/scala-2/test/explicitResultTypes/ExplicitResultTypesNil.scala
diff --git a/scalafix-tests/input/src/main/scala-3lts/test/explicitResultTypes/EnumerationValue.scala b/scalafix-tests/input/src/main/scala-3lts/test/explicitResultTypes/EnumerationValue.scala
new file mode 100644
index 000000000..935c34eee
--- /dev/null
+++ b/scalafix-tests/input/src/main/scala-3lts/test/explicitResultTypes/EnumerationValue.scala
@@ -0,0 +1,24 @@
+/*
+rules = ExplicitResultTypes
+*/
+package test.explicitResultTypes
+
+object EnumerationValue {
+  object Day extends Enumeration {
+    type Day = Value
+    val Weekday, Weekend = Value
+  }
+  object Bool extends Enumeration {
+    type Bool = Value
+    val True, False = Value
+  }
+  import Bool._
+  def day(d: Day.Value): Unit = ???
+  val d =
+    if (true) Day.Weekday
+    else Day.Weekend
+  day(d)
+  val b =
+    if (true) True
+    else False
+}
diff --git a/scalafix-tests/input/src/main/scala-3lts/test/explicitResultTypes/ExplicitResultTypesNil.scala b/scalafix-tests/input/src/main/scala-3lts/test/explicitResultTypes/ExplicitResultTypesNil.scala
new file mode 100644
index 000000000..c1ed72664
--- /dev/null
+++ b/scalafix-tests/input/src/main/scala-3lts/test/explicitResultTypes/ExplicitResultTypesNil.scala
@@ -0,0 +1,9 @@
+/*
+rules = "ExplicitResultTypes"
+ExplicitResultTypes.skipSimpleDefinitions = ["Lit"]
+ */
+package test.explicitResultTypes
+
+object ExplicitResultTypesNil {
+  val nil = Nil
+}
diff --git a/scalafix-tests/input/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesBase.scala b/scalafix-tests/input/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesBase.scala
index 665c02ab9..74e0e914b 100644
--- a/scalafix-tests/input/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesBase.scala
+++ b/scalafix-tests/input/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesBase.scala
@@ -26,6 +26,7 @@ object ExplicitResultTypesBase {
   object ExtraSpace {
     def * = "abc".length
     def ! = "abc".length
+    def foo_ = "abc".length
     def `x` = "abc".length
     def `x ` = "abc".length
   }
diff --git a/scalafix-tests/input/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesNil.scala b/scalafix-tests/input/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesNil.scala
new file mode 100644
index 000000000..c1ed72664
--- /dev/null
+++ b/scalafix-tests/input/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesNil.scala
@@ -0,0 +1,9 @@
+/*
+rules = "ExplicitResultTypes"
+ExplicitResultTypes.skipSimpleDefinitions = ["Lit"]
+ */
+package test.explicitResultTypes
+
+object ExplicitResultTypesNil {
+  val nil = Nil
+}
diff --git a/scalafix-tests/output/src/main/scala/test/explicitResultTypes/ExplicitResultTypesNil.scala b/scalafix-tests/output/src/main/scala-2/test/explicitResultTypes/ExplicitResultTypesNil.scala
similarity index 100%
rename from scalafix-tests/output/src/main/scala/test/explicitResultTypes/ExplicitResultTypesNil.scala
rename to scalafix-tests/output/src/main/scala-2/test/explicitResultTypes/ExplicitResultTypesNil.scala
diff --git a/scalafix-tests/output/src/main/scala-3/test/explicitResultTypes/ExplicitResultTypesBase.scala b/scalafix-tests/output/src/main/scala-3/test/explicitResultTypes/ExplicitResultTypesBase.scala
index 8fa911e05..50d5a5cdc 100644
--- a/scalafix-tests/output/src/main/scala-3/test/explicitResultTypes/ExplicitResultTypesBase.scala
+++ b/scalafix-tests/output/src/main/scala-3/test/explicitResultTypes/ExplicitResultTypesBase.scala
@@ -23,6 +23,7 @@ object ExplicitResultTypesBase {
   object ExtraSpace {
     def * : Int = "abc".length
     def ! : Int = "abc".length
+    def foo_ : Int = "abc".length
     def `x`: Int = "abc".length
     def `x `: Int = "abc".length
   }
diff --git a/scalafix-tests/output/src/main/scala-3/test/explicitResultTypes/EnumerationValue.scala b/scalafix-tests/output/src/main/scala-3lts/test/explicitResultTypes/EnumerationValue.scala
similarity index 100%
rename from scalafix-tests/output/src/main/scala-3/test/explicitResultTypes/EnumerationValue.scala
rename to scalafix-tests/output/src/main/scala-3lts/test/explicitResultTypes/EnumerationValue.scala
diff --git a/scalafix-tests/output/src/main/scala-3lts/test/explicitResultTypes/ExplicitResultTypesNil.scala b/scalafix-tests/output/src/main/scala-3lts/test/explicitResultTypes/ExplicitResultTypesNil.scala
new file mode 100644
index 000000000..0fa78e354
--- /dev/null
+++ b/scalafix-tests/output/src/main/scala-3lts/test/explicitResultTypes/ExplicitResultTypesNil.scala
@@ -0,0 +1,6 @@
+
+package test.explicitResultTypes
+
+object ExplicitResultTypesNil {
+  val nil: Nil.type = Nil
+}
diff --git a/scalafix-tests/output/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesNil.scala b/scalafix-tests/output/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesNil.scala
new file mode 100644
index 000000000..8a46dbf4e
--- /dev/null
+++ b/scalafix-tests/output/src/main/scala-3next/test/explicitResultTypes/ExplicitResultTypesNil.scala
@@ -0,0 +1,6 @@
+
+package test.explicitResultTypes
+
+object ExplicitResultTypesNil {
+  val nil: scala.collection.immutable.Nil.type = Nil
+}