diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala
index 66e2f99b84c5..a8c480088e08 100644
--- a/compiler/test/dotty/tools/utils.scala
+++ b/compiler/test/dotty/tools/utils.scala
@@ -116,6 +116,6 @@ class ToolArgsTest:
   @Test def `tool is present`: Unit = assertEquals("-hey" :: Nil, toolArgsFor(ToolName.Test, None)("// test: -hey" :: Nil))
   @Test def `missing tool is absent`: Unit = assertEquals(Nil, toolArgsFor(ToolName.Javac, None)("// test: -hey" :: Nil))
   @Test def `multitool is present`: Unit =
-    assertEquals("-hey" :: Nil, toolArgsFor(ToolName.Test, None)("// test: -hey" :: "// javac: -d /tmp" :: Nil))
-    assertEquals("-d" :: "/tmp" :: Nil, toolArgsFor(ToolName.Javac, None)("// test: -hey" :: "// javac: -d /tmp" :: Nil))
+    assertEquals("-hey" :: Nil, toolArgsFor(ToolName.Test, None)("// test: -hey" :: "// java: -d /tmp" :: Nil))
+    assertEquals("-d" :: "/tmp" :: Nil, toolArgsFor(ToolName.Java, None)("// test: -hey" :: "// java: -d /tmp" :: Nil))
 end ToolArgsTest
diff --git a/tests/pos/i18533/Cat.java b/tests/pos/i18533/Cat.java
index d7d284da90aa..33cdd99949bb 100644
--- a/tests/pos/i18533/Cat.java
+++ b/tests/pos/i18533/Cat.java
@@ -1,3 +1,6 @@
+//> using javacOpt --enable-preview --source 17
+//> test: -jvm 17+
+
 package i18533;
 
 public final class Cat extends Pet {
diff --git a/tests/pos/i18533/Dog.java b/tests/pos/i18533/Dog.java
index 12fdfba78a88..0b10b9f06c27 100644
--- a/tests/pos/i18533/Dog.java
+++ b/tests/pos/i18533/Dog.java
@@ -1,3 +1,6 @@
+//> using javacOpt --enable-preview --source 17
+//> test: -jvm 17+
+
 package i18533;
 
 public non-sealed class Dog extends Pet {
diff --git a/tests/pos/i18533/Pet.java b/tests/pos/i18533/Pet.java
index 23ab7c52d2c8..0985aa1f957f 100644
--- a/tests/pos/i18533/Pet.java
+++ b/tests/pos/i18533/Pet.java
@@ -1,3 +1,6 @@
+//> using javacOpt --enable-preview --source 17
+//> test: -jvm 17+
+
 package i18533;
 
 public sealed class Pet permits Cat, Dog {
diff --git a/tests/run/t9915/C_1.java b/tests/run/t9915/C_1.java
index 4269cf74e058..ec94b1412741 100644
--- a/tests/run/t9915/C_1.java
+++ b/tests/run/t9915/C_1.java
@@ -1,6 +1,3 @@
-/*
- * javac: -encoding UTF-8
- */
 public class C_1 {
     public static final String NULLED = "X\000ABC";
     public static final String SUPPED = "𐒈𐒝𐒑𐒛𐒐𐒘𐒕𐒖";