diff --git a/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/lexer/FSharpKeywordsMap.java b/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/lexer/FSharpKeywordsMap.java
index 411c3435de..0f0932269b 100644
--- a/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/lexer/FSharpKeywordsMap.java
+++ b/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/lexer/FSharpKeywordsMap.java
@@ -7,7 +7,7 @@
 
 import java.util.Map;
 
-class FSharpKeywordsMap {
+final class FSharpKeywordsMap {
   private static final Map<CharSequence, IElementType> ourKeywordMap = CollectionFactory.createCharSequenceMap(true);
 
   static {
diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/debugger/AsyncDebuggerTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/debugger/AsyncDebuggerTest.kt
index e1cb79b7ee..da075e8459 100644
--- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/debugger/AsyncDebuggerTest.kt
+++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/debugger/AsyncDebuggerTest.kt
@@ -1,5 +1,7 @@
 package com.jetbrains.rider.plugins.fsharp.test.cases.debugger
 
+import com.jetbrains.rider.test.OpenSolutionParams
+import com.jetbrains.rider.test.annotations.Solution
 import com.jetbrains.rider.test.annotations.TestEnvironment
 import com.jetbrains.rider.test.base.DebuggerTestBase
 import com.jetbrains.rider.test.env.enums.SdkVersion
@@ -9,12 +11,15 @@ import org.testng.annotations.Test
 
 @Test
 @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_6)
+@Solution("AsyncProgram")
 class AsyncDebuggerTest : DebuggerTestBase() {
   override val projectName = "AsyncProgram"
-  override val testSolution: String = projectName
 
-  override val waitForCaches = true
-  override val restoreNuGetPackages = true
+  override fun modifyOpenSolutionParams(params: OpenSolutionParams) {
+    super.modifyOpenSolutionParams(params)
+    params.waitForCaches = true
+    params.restoreNuGetPackages = true
+  }
 
   @Test(description = "RIDER-27263")
   fun testAsyncBreakpoint() {
diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt
index f4298a4d70..da5b774e36 100644
--- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt
+++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt
@@ -2,6 +2,7 @@ package com.jetbrains.rider.plugins.fsharp.test.cases.projectModel
 
 import com.jetbrains.rd.ide.model.RdDndOrderType
 import com.jetbrains.rider.plugins.fsharp.test.fcsHost
+import com.jetbrains.rider.test.OpenSolutionParams
 import com.jetbrains.rider.test.annotations.*
 import com.jetbrains.rider.test.base.ProjectModelBaseTest
 import com.jetbrains.rider.test.env.enums.SdkVersion
@@ -12,9 +13,12 @@ import org.testng.annotations.Test
 import java.io.File
 
 @Test
+@Solution("EmptySolution")
 class FSharpProjectModelTest : ProjectModelBaseTest() {
-  override val testSolution: String = "EmptySolution"
-  override val restoreNuGetPackages = true
+  override fun modifyOpenSolutionParams(params: OpenSolutionParams) {
+    super.modifyOpenSolutionParams(params)
+    params.restoreNuGetPackages = true
+  }
 
   private fun moveItem(from: Array<Array<String>>, to: Array<String>, orderType: RdDndOrderType? = null) {
     // Wait for updating/refreshing items possibly queued by FSharpItemsContainerRefresher.
diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt
index 31c6466a29..e82076e7f3 100644
--- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt
+++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt
@@ -14,6 +14,7 @@ import com.jetbrains.rider.plugins.fsharp.test.withNonFSharpProjectReferences
 import com.jetbrains.rider.projectView.workspace.containingProjectEntity
 import com.jetbrains.rider.projectView.workspace.getId
 import com.jetbrains.rider.projectView.workspace.getProjectModelEntity
+import com.jetbrains.rider.test.OpenSolutionParams
 import com.jetbrains.rider.test.annotations.Mute
 import com.jetbrains.rider.test.annotations.Solution
 import com.jetbrains.rider.test.annotations.TestEnvironment
@@ -31,13 +32,17 @@ import java.time.Duration
 
 @Test
 @TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE)
+@Solution("EmptySolution")
 class FcsModuleReaderTest : ProjectModelBaseTest() {
   companion object {
     private var launchCounter = 0
   }
 
-  override val testSolution: String = "EmptySolution"
-  override val restoreNuGetPackages = true
+  override fun modifyOpenSolutionParams(params: OpenSolutionParams) {
+    super.modifyOpenSolutionParams(params)
+    params.restoreNuGetPackages = true
+    params.backendLoadedTimeout = Duration.ofMinutes(20)
+  }
 
   @AfterMethod(alwaysRun = true)
   fun tearDownTestCase() {
@@ -236,9 +241,6 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
     }
   }
 
-  override val backendLoadedTimeout: Duration
-    get() = Duration.ofMinutes(20)
-
   @Solution("ProjectReferencesCSharp2")
   @Test
   fun testGotoUsagesFromCSharp() {