diff --git a/compiler/test/dotty/tools/dotc/BestEffortCompilationTests.scala b/compiler/test/dotty/tools/dotc/BestEffortOptionsTests.scala
similarity index 94%
rename from compiler/test/dotty/tools/dotc/BestEffortCompilationTests.scala
rename to compiler/test/dotty/tools/dotc/BestEffortOptionsTests.scala
index 681c92f266d2..1e7262f5fd8d 100644
--- a/compiler/test/dotty/tools/dotc/BestEffortCompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/BestEffortOptionsTests.scala
@@ -10,10 +10,10 @@ import java.io.{File => JFile}
 
 import scala.language.unsafeNulls
 
-class BestEffortCompilationTests {
+class BestEffortOptionsTests {
   import ParallelTesting._
   import vulpix.TestConfiguration._
-  import BestEffortCompilationTests._
+  import BestEffortOptionsTests._
   import CompilationTest.aggregateTests
 
   // Since TASTy and beTASTy files are read in a lazy manner (only when referenced by the source .scala file)
@@ -42,7 +42,7 @@ class BestEffortCompilationTests {
   }
 }
 
-object BestEffortCompilationTests extends ParallelTesting {
+object BestEffortOptionsTests extends ParallelTesting {
   def maxDuration = 45.seconds
   def numberOfSlaves = Runtime.getRuntime.availableProcessors()
   def safeMode = Properties.testsSafeMode
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index 880a3bd1cc53..6ff0d3fba5ca 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -1610,7 +1610,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  '-Ywith-best-effort-tasty' to test the TastyReader for Best Effort TASTy.
    */
   def compileBestEffortTastyInDir(f: String, flags: TestFlags, picklingFilter: FileFilter, unpicklingFilter: FileFilter)(
-      implicit testGroup: TestGroup): BestEffortCompilationTest = {
+      implicit testGroup: TestGroup): BestEffortOptionsTest = {
     val bestEffortFlag = "-Ybest-effort"
     val semanticDbFlag = "-Xsemanticdb"
     assert(!flags.options.contains(bestEffortFlag), "Best effort compilation flag should not be added manually")
@@ -1687,7 +1687,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         new CompilationFromBestEffortTasty(testGroup.name, f, flags, bestEffortDir)
       }
 
-    new BestEffortCompilationTest(
+    new BestEffortOptionsTest(
       new CompilationTest(bestEffortTargets).keepOutput,
       new CompilationTest(fromTastyTargets).keepOutput,
       bestEffortDirs,
@@ -1735,7 +1735,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       (step1Compilation, step2Compilation, bestEffortDir)
     }.unzip3
 
-    BestEffortCompilationTest(
+    BestEffortOptionsTest(
       new CompilationTest(step1Targets).keepOutput,
       new CompilationTest(step2Targets).keepOutput,
       bestEffortDirs,
@@ -1770,7 +1770,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     }
   }
 
-  class BestEffortCompilationTest(step1: CompilationTest, step2: CompilationTest, bestEffortDirs: List[JFile], shouldDelete: Boolean)(implicit testGroup: TestGroup) {
+  class BestEffortOptionsTest(step1: CompilationTest, step2: CompilationTest, bestEffortDirs: List[JFile], shouldDelete: Boolean)(implicit testGroup: TestGroup) {
 
     def checkNoCrash()(implicit summaryReport: SummaryReporting): this.type = {
       step1.checkNoBestEffortError() // Compile all files to generate the class files with best effort tasty