diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala
index 5fb85e0c6b7..0a1fe6da216 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala
@@ -182,12 +182,6 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|SimpleFileVisitor[$0]
        |""".stripMargin,
-    // compat = Map(
-    //   // scala 3 new completions not implemented, so no way to distinguish if we are at a type position
-    //   "3" ->
-    //     """|SimpleFileVisitor
-    //        |""".stripMargin
-    // ),
   )
 
   checkSnippet(
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
index 112c5f97411..6a84f90d720 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
@@ -359,6 +359,20 @@ class CompletionSuite extends BaseCompletionSuite {
        |CertPathBuilderException - java.security.cert
        |PKIXCertPathBuilderResult - java.security.cert
        |""".stripMargin,
+    compat = Map(
+      "2.12.11" ->
+        """|ProcessBuilder java.lang
+           |ProcessBuilder - scala.sys.process
+           |CertPathBuilder - java.security.cert
+           |CertPathBuilderSpi - java.security.cert
+           |ProcessBuilderImpl - scala.sys.process
+           |CertPathBuilderResult - java.security.cert
+           |PKIXBuilderParameters - java.security.cert
+           |PooledConnectionBuilder - javax.sql
+           |CertPathBuilderException - java.security.cert
+           |PKIXCertPathBuilderResult - java.security.cert
+           |""".stripMargin
+    ),
   )
 
   check(
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
index ef9050c717b..0f3f1d712ad 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
@@ -115,6 +115,15 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |)
        |""".stripMargin,
     filter = _ == "Future - scala.concurrent",
+    compat = Map(
+      "2.12.11" ->
+        """|package `import-conflict3`
+           |import java.util.concurrent.Future
+           |case class Foo(
+           |  name: scala.concurrent.Future
+           |)
+           |""".stripMargin
+    ),
   )
 
   checkEdit(
@@ -132,6 +141,15 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |)
        |""".stripMargin,
     filter = _ == "Future - scala.concurrent",
+    compat = Map(
+      "2.12.11" ->
+        """|package `import-conflict4`
+           |import java.util.concurrent._
+           |case class Foo(
+           |  name: scala.concurrent.Future
+           |)
+           |""".stripMargin
+    ),
   )
 
   checkEdit(
@@ -150,6 +168,16 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |)
        |""".stripMargin,
     filter = _ == "Future - scala.concurrent",
+    compat = Map(
+      "2.12.11" ->
+        """|package `import-no-conflict`
+           |import java.util.concurrent.{Future => _, _}
+           |import scala.concurrent.Future
+           |case class Foo(
+           |  name: Future
+           |)
+           |""".stripMargin
+    ),
   )
 
   checkEdit(
@@ -180,6 +208,14 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
       |import java.util.concurrent.CompletableFuture
       |object Main extends CompletableFuture[$0]
       |""".stripMargin,
+    compat = Map(
+      "2.12.11" ->
+        """package pkg
+          |
+          |import java.util.concurrent.CompletableFuture
+          |object Main extends CompletableFuture
+          |""".stripMargin
+    ),
   )
 
   checkEdit(
@@ -192,6 +228,14 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
       |import java.util.concurrent.CompletableFuture
       |object Main extends CompletableFuture[$0]
       |""".stripMargin,
+    compat = Map(
+      "2.12.11" ->
+        """package pkg
+          |
+          |import java.util.concurrent.CompletableFuture
+          |object Main extends CompletableFuture
+          |""".stripMargin
+    ),
   )
 
   checkEdit(
@@ -305,6 +349,16 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     filter = _.contains("java.util"),
+    compat = Map(
+      "2.12.11" ->
+        """|import java.util.ArrayDeque
+           |object Main {
+           |  def foo(): Unit = null match {
+           |    case x: ArrayDeque =>
+           |  }
+           |}
+           |""".stripMargin
+    ),
   )
 
   checkEdit(
@@ -323,6 +377,16 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     filter = _.contains("scala.util"),
+    compat = Map(
+      "2.12.11" ->
+        """|import scala.util.Failure
+           |object Main {
+           |  def foo(): Unit = {
+           |    val x: Failure
+           |  }
+           |}
+           |""".stripMargin
+    ),
   )
 
   checkEdit(