diff --git a/test/langtools/tools/javac/4980495/static/Test.java b/test/langtools/tools/javac/4980495/static/Test.java
index 28153ed88108b..09321e5addd85 100644
--- a/test/langtools/tools/javac/4980495/static/Test.java
+++ b/test/langtools/tools/javac/4980495/static/Test.java
@@ -11,7 +11,7 @@
 
 public class Test {
 
-    public static void main(String argv[]) {
+    public static void meth() {
         f = 1;
     }
 }
diff --git a/test/langtools/tools/javac/4980495/std/Test.java b/test/langtools/tools/javac/4980495/std/Test.java
index 7f5c6734df830..dbc21b25cb63c 100644
--- a/test/langtools/tools/javac/4980495/std/Test.java
+++ b/test/langtools/tools/javac/4980495/std/Test.java
@@ -12,7 +12,7 @@
 
 public class Test {
 
-    public static void main(String argv[]) {
+    public static void meth() {
         new f();
     }
 }
diff --git a/test/langtools/tools/javac/6491592/T6491592.java b/test/langtools/tools/javac/6491592/T6491592.java
index 0513fbdedff64..2e39b1180c447 100644
--- a/test/langtools/tools/javac/6491592/T6491592.java
+++ b/test/langtools/tools/javac/6491592/T6491592.java
@@ -7,7 +7,7 @@
  */
 
 public class T6491592 {
-    public static void main(String... args) {
+    public static void meth() {
         Object o = null;
         o += null;
     }
diff --git a/test/langtools/tools/javac/6857948/T6857948.java b/test/langtools/tools/javac/6857948/T6857948.java
index e4f7ee527d92c..ab98a4fee6e9f 100644
--- a/test/langtools/tools/javac/6857948/T6857948.java
+++ b/test/langtools/tools/javac/6857948/T6857948.java
@@ -12,7 +12,7 @@ class Foo {
 };
 
 class Test {
-   public static void main() {
+   public static void meth() {
       Foo f = new Foo("Hello!",nosuchfunction()) {};
    }
 }
diff --git a/test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java b/test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java
index 0880fde6cfc8a..292e33963721e 100644
--- a/test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java
+++ b/test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java
@@ -7,7 +7,7 @@
  */
 
 public class UnresolvableClassNPEInAttrTest {
-    public static void main(String[] args) {
+    public static void meth() {
         new Undefined() {
             void test() {
                 new Object() {};
diff --git a/test/langtools/tools/javac/8161985/T8161985a.java b/test/langtools/tools/javac/8161985/T8161985a.java
index 99277f68cf206..c06cfc4044976 100644
--- a/test/langtools/tools/javac/8161985/T8161985a.java
+++ b/test/langtools/tools/javac/8161985/T8161985a.java
@@ -6,7 +6,7 @@
  */
 
 class T8161985 {
-    public static void main(String [] arg) {
+    public static void meth() {
         T8161985 t = new T8161985();
         t.getClass();
 
diff --git a/test/langtools/tools/javac/8238735/T8238735.java b/test/langtools/tools/javac/8238735/T8238735.java
index eb71c9a9fe65e..a69c08035f891 100644
--- a/test/langtools/tools/javac/8238735/T8238735.java
+++ b/test/langtools/tools/javac/8238735/T8238735.java
@@ -6,7 +6,7 @@
  */
 
 class T8238735 {
-     public static void main(String[] args) {
+     public static void meth() {
         boolean first = true;
         first = first ? false : (boolean)(() -> false) ;
     }
diff --git a/test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java b/test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java
index b7d0a73d576f5..411c99728bee3 100644
--- a/test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java
+++ b/test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java
@@ -24,8 +24,4 @@ void foo() {
                 }
             }); }
     }
-
-    public static void main(String[] args) {
-        new JavacBug();
-    }
-}
\ No newline at end of file
+}
diff --git a/test/langtools/tools/javac/BreakAcrossClass.java b/test/langtools/tools/javac/BreakAcrossClass.java
index b253cb894e648..9d5407b6d128f 100644
--- a/test/langtools/tools/javac/BreakAcrossClass.java
+++ b/test/langtools/tools/javac/BreakAcrossClass.java
@@ -8,7 +8,7 @@
  */
 
 class BreakAcrossClass {
-     public static void main(String argv[]) {
+     public static void meth() {
         final int i = 6;
     M:  {
             class A {
diff --git a/test/langtools/tools/javac/CaptureInSubtype.java b/test/langtools/tools/javac/CaptureInSubtype.java
index 3b73e20a6dd8c..f3e7ecb749886 100644
--- a/test/langtools/tools/javac/CaptureInSubtype.java
+++ b/test/langtools/tools/javac/CaptureInSubtype.java
@@ -37,14 +37,4 @@ public static class ShowFlaw extends SuperOfShowFlaw {
 
         Flaw<?> m(){return fn;}
     }
-
-    public static void main(String[] args) {
-        SuperOfShowFlaw sosf = new ShowFlaw();
-        SuperOfFlaw<List<?>> sof = sosf.m();
-        List<String> ls = new ArrayList<String>();
-        ls.add("Smalltalk rules!");
-        sof.put(ls);
-        Number n = ShowFlaw.fn.get().get(0);
-    }
-
 }
diff --git a/test/langtools/tools/javac/DefiniteAssignment/DASwitch.java b/test/langtools/tools/javac/DefiniteAssignment/DASwitch.java
index 6cef2023cd816..cb112d78c9c0f 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/DASwitch.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/DASwitch.java
@@ -8,7 +8,7 @@
  */
 
 public class DASwitch {
-    public static void main(final String[] args) {
+    public static void meth() {
         int t = 1;
         {
             final int x;
diff --git a/test/langtools/tools/javac/DefiniteAssignment/DUParam1.java b/test/langtools/tools/javac/DefiniteAssignment/DUParam1.java
index c55abd74e1518..6215eec3b55ea 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/DUParam1.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/DUParam1.java
@@ -8,7 +8,7 @@
  */
 
 public class DUParam1 {
-    public static void main(final String[] args) {
+    public static void meth(final String[] args) {
         // 8.4.1 makes it illegal to assign to a final parameter.
         if (false) args = null;
     }
diff --git a/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java
index d15cfa70b2cfa..9c7c26ab88589 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java
@@ -11,7 +11,7 @@ class E1 extends Exception {}
 class E2 extends Exception {}
 
 public class DefAssignAfterTry1 {
-    public static void main(String argv[]) {
+    public static void meth() {
         boolean t = true;
         E1 se1 = new E1();
         E2 se2 = new E2();
diff --git a/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java
index 6af6748ef50e9..479cd5b1c81be 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java
@@ -11,7 +11,7 @@ class E1 extends Exception {}
 class E2 extends Exception {}
 
 public class DefAssignAfterTry2 {
-    public static void main(String argv[]) {
+    public static void meth() {
         boolean t = true;
         E1 se1 = new E1();
         E2 se2 = new E2();
diff --git a/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java
index 955d83de816ce..1cdad7c5bea47 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java
@@ -11,7 +11,7 @@ class E1 extends Exception {}
 class E2 extends Exception {}
 
 public class DefAssignAfterTry3 {
-    public static void main(String argv[]) {
+    public static void meth() {
         boolean t = true;
         E1 se1 = new E1();
         E2 se2 = new E2();
diff --git a/test/langtools/tools/javac/DefiniteAssignment/T4717164.java b/test/langtools/tools/javac/DefiniteAssignment/T4717164.java
index 7cdfa9fab9265..8c067982d101e 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/T4717164.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/T4717164.java
@@ -8,7 +8,7 @@
  */
 
 class T4717164 {
-    public static void main(String[] args) {
+    public static void meth() {
         try {
             try {
                 throw new ClassNotFoundException();
diff --git a/test/langtools/tools/javac/DefiniteAssignment/T4718142.java b/test/langtools/tools/javac/DefiniteAssignment/T4718142.java
index d6e218992ec3a..5167d96aac13a 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/T4718142.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/T4718142.java
@@ -12,7 +12,7 @@ static class E extends Exception {}
     static void thr() throws E {
         throw new E();
     }
-    public static void main(String[] args) {
+    public static void meth() {
         int count = 0;
         final int i;
         while (true) {
diff --git a/test/langtools/tools/javac/DefiniteAssignment/T4718142a.java b/test/langtools/tools/javac/DefiniteAssignment/T4718142a.java
index d70fc227b6c5b..24d152e7f19f0 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/T4718142a.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/T4718142a.java
@@ -8,7 +8,7 @@
  */
 
 class T4718142a {
-    public static void main(String[] args) {
+    public static void meth() {
         final int i;
         for (int n=0; n<10; n++) {
             b: {
diff --git a/test/langtools/tools/javac/DefiniteAssignment/UncaughtException.java b/test/langtools/tools/javac/DefiniteAssignment/UncaughtException.java
index f43bbea96f0f8..d12eae0519630 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/UncaughtException.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/UncaughtException.java
@@ -21,8 +21,4 @@ class B extends A implements I {
 }
 
 public class UncaughtException {
-    public static void main (String[] args) {
-        I b = new B();
-        b.throwCheckedException();
-    }
 }
diff --git a/test/langtools/tools/javac/OverrideChecks/T4721069.java b/test/langtools/tools/javac/OverrideChecks/T4721069.java
index ea8f4da567da7..99c4f5baab340 100644
--- a/test/langtools/tools/javac/OverrideChecks/T4721069.java
+++ b/test/langtools/tools/javac/OverrideChecks/T4721069.java
@@ -18,7 +18,7 @@ static void f(I i) {
                 x.getClass();
             }
         }
-        public static void main(String[] args) {
+        public static void meth() {
             f(null);
         }
     }
diff --git a/test/langtools/tools/javac/ParseConditional.java b/test/langtools/tools/javac/ParseConditional.java
index afedfc41216df..ca909da59cba7 100644
--- a/test/langtools/tools/javac/ParseConditional.java
+++ b/test/langtools/tools/javac/ParseConditional.java
@@ -9,7 +9,7 @@
  */
 
 public class ParseConditional {
-    public static void main(String[] args) {
+    public static void meth() {
         boolean condition = true;
         int a = 1;
         int b = 2;
diff --git a/test/langtools/tools/javac/SwitchScope.java b/test/langtools/tools/javac/SwitchScope.java
index a7c0aabe75f1c..970132e4f6f9f 100644
--- a/test/langtools/tools/javac/SwitchScope.java
+++ b/test/langtools/tools/javac/SwitchScope.java
@@ -8,7 +8,7 @@
  */
 
 public class SwitchScope {
-    public static void main(String[] args) {
+    public static void meth(String[] args) {
         switch (args.length) {
         case 0:
             final int k;
diff --git a/test/langtools/tools/javac/SynthName2.java b/test/langtools/tools/javac/SynthName2.java
index ee0a183a44848..8570044f43bff 100644
--- a/test/langtools/tools/javac/SynthName2.java
+++ b/test/langtools/tools/javac/SynthName2.java
@@ -10,7 +10,7 @@
 import java.io.PrintStream;
 
 class SynthName2 {
-    public static void main(String args[]) {
+    public static void meth(String args[]) {
         run(args, System.out);
     }
     public static void run(String args[],PrintStream out) {
diff --git a/test/langtools/tools/javac/T5003235/T5003235b.java b/test/langtools/tools/javac/T5003235/T5003235b.java
index 7787a267712d3..8cb9bdaf85f2d 100644
--- a/test/langtools/tools/javac/T5003235/T5003235b.java
+++ b/test/langtools/tools/javac/T5003235/T5003235b.java
@@ -22,7 +22,7 @@ private class Inner {
 }
 
 class Access {
-    public static void main(String[] args) {
+    public static void meth() {
         Outer outer = new Outer();
         outer.create();
         System.out.println("Value of k: " + outer.inner.k);
diff --git a/test/langtools/tools/javac/T6306967.java b/test/langtools/tools/javac/T6306967.java
index 53c52a6ee3508..7bdfe8b899084 100644
--- a/test/langtools/tools/javac/T6306967.java
+++ b/test/langtools/tools/javac/T6306967.java
@@ -7,7 +7,7 @@
  */
 
 public class T6306967 {
-    public static void main(String[] args) {
+    public static void meth() {
         final int x;
         while(true) {
             if (true) {
diff --git a/test/langtools/tools/javac/T6326754.java b/test/langtools/tools/javac/T6326754.java
index 5612ac65c0c27..209cc2e825c01 100644
--- a/test/langtools/tools/javac/T6326754.java
+++ b/test/langtools/tools/javac/T6326754.java
@@ -42,7 +42,7 @@ public <T>void setT(T t){
     }
 }
 public class T6326754{
-    public static void main(String... arg){
+    public static void meth() {
         TestC tC =new TestC();
         tC.setT();
         TestConstructor tc = new TestConstructor("saaa");
diff --git a/test/langtools/tools/javac/T6379327.java b/test/langtools/tools/javac/T6379327.java
index dc7bae36d13bd..2fe690e4deaa8 100644
--- a/test/langtools/tools/javac/T6379327.java
+++ b/test/langtools/tools/javac/T6379327.java
@@ -8,7 +8,7 @@
 
 import java.security.*;
 public class T6379327 {
-    public static void main(String[] args) {
+    public static void meth(String[] args) {
         final String name = args[0];
         try {
             new PrivilegedExceptionAction() {
diff --git a/test/langtools/tools/javac/T6407257.java b/test/langtools/tools/javac/T6407257.java
index f2b4ea7149eed..7d5da43cab04c 100644
--- a/test/langtools/tools/javac/T6407257.java
+++ b/test/langtools/tools/javac/T6407257.java
@@ -9,7 +9,4 @@
 class T6407257a extends T6407257a {}
 
 public class T6407257 extends T6407257a {
-    public static void main(String... args) {
-        main(args);
-    }
 }
diff --git a/test/langtools/tools/javac/TryWithResources/BadTwr.java b/test/langtools/tools/javac/TryWithResources/BadTwr.java
index 73de447d2f478..6043c527af174 100644
--- a/test/langtools/tools/javac/TryWithResources/BadTwr.java
+++ b/test/langtools/tools/javac/TryWithResources/BadTwr.java
@@ -7,7 +7,7 @@
  */
 
 public class BadTwr implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth(String... args) {
         // illegal repeated name
         try(BadTwr r1 = new BadTwr(); BadTwr r1 = new BadTwr()) {
             System.out.println(r1.toString());
diff --git a/test/langtools/tools/javac/TryWithResources/BadTwr.out b/test/langtools/tools/javac/TryWithResources/BadTwr.out
index d426f74753281..a11fc90e071d6 100644
--- a/test/langtools/tools/javac/TryWithResources/BadTwr.out
+++ b/test/langtools/tools/javac/TryWithResources/BadTwr.out
@@ -1,5 +1,5 @@
-BadTwr.java:12:46: compiler.err.already.defined: kindname.variable, r1, kindname.method, main(java.lang.String...)
-BadTwr.java:17:20: compiler.err.already.defined: kindname.variable, args, kindname.method, main(java.lang.String...)
+BadTwr.java:12:46: compiler.err.already.defined: kindname.variable, r1, kindname.method, meth(java.lang.String...)
+BadTwr.java:17:20: compiler.err.already.defined: kindname.variable, args, kindname.method, meth(java.lang.String...)
 BadTwr.java:20:13: compiler.err.cant.assign.val.to.final.var: thatsIt
-BadTwr.java:25:24: compiler.err.already.defined: kindname.variable, name, kindname.method, main(java.lang.String...)
+BadTwr.java:25:24: compiler.err.already.defined: kindname.variable, name, kindname.method, meth(java.lang.String...)
 4 errors
diff --git a/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java b/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java
index f080b758972bc..988249cef2001 100644
--- a/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java
+++ b/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java
@@ -8,7 +8,7 @@
 
 import java.io.IOException;
 public class BadTwrSyntax implements AutoCloseable {
-    public static void main(String... args) throws Exception {
+    public static void meth() {
         // illegal double semicolon ending resources
         try(BadTwr twrflow = new BadTwr();;) {
             System.out.println(twrflow.toString());
diff --git a/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.java b/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.java
index 52b8d243eee5a..a2d7ea74c3f3c 100644
--- a/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.java
+++ b/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.java
@@ -8,7 +8,7 @@
 
 class DuplicateResourceDecl {
 
-    public static void main(String[] args) {
+    public static void meth() {
         try(MyResource c = new MyResource();MyResource c = new MyResource()) {
         //do something
         } catch (Exception e) { }
diff --git a/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.out b/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.out
index c6406eb776865..11c07b24cb36f 100644
--- a/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.out
+++ b/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.out
@@ -1,2 +1,2 @@
-DuplicateResourceDecl.java:12:56: compiler.err.already.defined: kindname.variable, c, kindname.method, main(java.lang.String[])
+DuplicateResourceDecl.java:12:56: compiler.err.already.defined: kindname.variable, c, kindname.method, meth()
 1 error
diff --git a/test/langtools/tools/javac/TryWithResources/ImplicitFinal.java b/test/langtools/tools/javac/TryWithResources/ImplicitFinal.java
index 33e80365c36ab..1f55aba09e45a 100644
--- a/test/langtools/tools/javac/TryWithResources/ImplicitFinal.java
+++ b/test/langtools/tools/javac/TryWithResources/ImplicitFinal.java
@@ -9,7 +9,7 @@
 import java.io.IOException;
 
 class ImplicitFinal implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         try(ImplicitFinal r = new ImplicitFinal()) {
             r = null; //disallowed
         } catch (IOException ioe) { // Not reachable
diff --git a/test/langtools/tools/javac/TryWithResources/PlainTry.java b/test/langtools/tools/javac/TryWithResources/PlainTry.java
index cd46153cd71a8..edbb233578b2f 100644
--- a/test/langtools/tools/javac/TryWithResources/PlainTry.java
+++ b/test/langtools/tools/javac/TryWithResources/PlainTry.java
@@ -6,7 +6,7 @@
  * @compile/fail/ref=PlainTry.out  -XDrawDiagnostics                           PlainTry.java
  */
 public class PlainTry {
-    public static void main(String... args) {
+    public static void meth() {
         try {
             ;
         }
diff --git a/test/langtools/tools/javac/TryWithResources/T7022711.java b/test/langtools/tools/javac/TryWithResources/T7022711.java
index 0994630e6a17d..1b9ab730eca54 100644
--- a/test/langtools/tools/javac/TryWithResources/T7022711.java
+++ b/test/langtools/tools/javac/TryWithResources/T7022711.java
@@ -8,7 +8,7 @@
 import java.io.*;
 
 class T7022711 {
-    public static void main (String args[]) throws Exception {
+    public static void meth() {
         // declared resource
         try (DataInputStream is = new DataInputStream(new FileInputStream("x"))) {
             while (true) {
diff --git a/test/langtools/tools/javac/TryWithResources/TwrAndLambda.java b/test/langtools/tools/javac/TryWithResources/TwrAndLambda.java
index da693b3686b05..1e9ec29be68e6 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrAndLambda.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrAndLambda.java
@@ -7,7 +7,7 @@
 
 public class TwrAndLambda {
 
-    public static void main(String... args) {
+    public static void meth() {
 
         // Lambda expression
         AutoCloseable v1 = () -> {};
diff --git a/test/langtools/tools/javac/TryWithResources/TwrFlow.java b/test/langtools/tools/javac/TryWithResources/TwrFlow.java
index eec9eb8e06367..8ea54244570f7 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrFlow.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrFlow.java
@@ -8,7 +8,7 @@
 
 import java.io.IOException;
 public class TwrFlow implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         try(TwrFlow twrFlow = new TwrFlow()) {
             System.out.println(twrFlow.toString());
         } catch (IOException ioe) { // Not reachable
diff --git a/test/langtools/tools/javac/TryWithResources/TwrForVariable2.java b/test/langtools/tools/javac/TryWithResources/TwrForVariable2.java
index 73dd3fa257178..fb203f5a24ad1 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrForVariable2.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrForVariable2.java
@@ -5,7 +5,7 @@
  * @compile/fail/ref=TwrForVariable2.out -XDrawDiagnostics -Xlint:-options TwrForVariable2.java
  */
 public class TwrForVariable2 implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         TwrForVariable2 v = new TwrForVariable2();
         TwrForVariable3[] v2 = new TwrForVariable3[1];
         TwrForVariable3[][] v3 = new TwrForVariable3[1][1];
diff --git a/test/langtools/tools/javac/TryWithResources/TwrForVariable3.java b/test/langtools/tools/javac/TryWithResources/TwrForVariable3.java
index c947fc8f0a4b4..e9254ae927de0 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrForVariable3.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrForVariable3.java
@@ -4,7 +4,7 @@
  * @compile/fail/ref=TwrForVariable3.out -XDrawDiagnostics -Xlint:-options TwrForVariable3.java
  */
 public class TwrForVariable3 implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         TwrForVariable3 v1 = new TwrForVariable3();
         Object v2 = new Object();
         Object v3 = new Object() {
diff --git a/test/langtools/tools/javac/TryWithResources/TwrForVariable4.java b/test/langtools/tools/javac/TryWithResources/TwrForVariable4.java
index d8437a0d29517..9209f56b2af9b 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrForVariable4.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrForVariable4.java
@@ -5,7 +5,7 @@
  * @compile/fail/ref=TwrForVariable4.out -XDrawDiagnostics -Xlint:-options TwrForVariable4.java
  */
 public class TwrForVariable4 implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         TwrForVariable4 uninitialized;
 
         try (uninitialized) {
diff --git a/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java b/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java
index 84d1d56316185..ac0a72645ba3a 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java
@@ -7,7 +7,7 @@
  */
 
 class TwrOnNonResource {
-    public static void main(String... args) {
+    public static void meth() {
         try(TwrOnNonResource aonr = new TwrOnNonResource()) {
             System.out.println(aonr.toString());
         }
diff --git a/test/langtools/tools/javac/TryWithResources/TwrVarKinds.java b/test/langtools/tools/javac/TryWithResources/TwrVarKinds.java
index 5d9c3c5aff4c1..65fd1fc837d6a 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrVarKinds.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrVarKinds.java
@@ -12,7 +12,7 @@ public class TwrVarKinds implements AutoCloseable {
     static TwrVarKinds r3 = new TwrVarKinds();
     TwrVarKinds r4 = new TwrVarKinds();
 
-    public static void main(String... args) {
+    public static void meth() {
 
         TwrVarKinds r5 = new TwrVarKinds();
 
diff --git a/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.java b/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.java
index 3bc4b83082ec4..8c31354d6295f 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.java
@@ -7,7 +7,7 @@
 
 public class TwrVarRedeclaration implements AutoCloseable {
 
-    public static void main(String... args) {
+    public static void meth() {
         TwrVarRedeclaration r = new TwrVarRedeclaration();
 
         try (r) {
diff --git a/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.out b/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.out
index d2e219cf783ab..82652229605e8 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.out
+++ b/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.out
@@ -1,4 +1,4 @@
-TwrVarRedeclaration.java:14:33: compiler.err.already.defined: kindname.variable, r, kindname.method, main(java.lang.String...)
-TwrVarRedeclaration.java:18:20: compiler.err.already.defined: kindname.variable, r, kindname.method, main(java.lang.String...)
-TwrVarRedeclaration.java:23:23: compiler.err.already.defined: kindname.variable, r, kindname.method, main(java.lang.String...)
+TwrVarRedeclaration.java:14:33: compiler.err.already.defined: kindname.variable, r, kindname.method, meth()
+TwrVarRedeclaration.java:18:20: compiler.err.already.defined: kindname.variable, r, kindname.method, meth()
+TwrVarRedeclaration.java:23:23: compiler.err.already.defined: kindname.variable, r, kindname.method, meth()
 3 errors
diff --git a/test/langtools/tools/javac/UseEnum.java b/test/langtools/tools/javac/UseEnum.java
index 642e84b1d737d..315be40a74924 100644
--- a/test/langtools/tools/javac/UseEnum.java
+++ b/test/langtools/tools/javac/UseEnum.java
@@ -10,7 +10,7 @@
 
 class UseEnum {
     enum Animal {cat, dog, bird, fish};
-    public static void main(String args[]) {
+    public static void meth() {
         Animal pet;
 
         pet = Animal.cat;
diff --git a/test/langtools/tools/javac/annotations/neg/Cycle3.java b/test/langtools/tools/javac/annotations/neg/Cycle3.java
index 7aff00a3d6d58..04e6d577b6adb 100644
--- a/test/langtools/tools/javac/annotations/neg/Cycle3.java
+++ b/test/langtools/tools/javac/annotations/neg/Cycle3.java
@@ -19,8 +19,4 @@
 
 @A
 class Main {
-    public static void main(String[] args) {
-        A a = Main.class.getAnnotation(A.class);
-        System.out.println(a);
-    }
 }
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.java
index a76ea3a6b9131..6cd803ef11faf 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.java
@@ -18,7 +18,7 @@ class C {
   // static method
   static int f() { return @A C.f; }
   // main
-  public static void main(String... args) {
+  public static void meth() {
     int a = @A C.f;
   }
 }
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java
index b2ac84e213b24..4a51a9995e653 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java
@@ -30,7 +30,7 @@ void m0x1E() {
 }
 
 class ClassLiterals {
-    public static void main(String[] args) {
+    public static void meth() {
         if (String.class != @A String.class) throw new Error();
         if (@A int.class != int.class) throw new Error();
         if (@A int.class != Integer.TYPE) throw new Error();
diff --git a/test/langtools/tools/javac/capture/Martin.java b/test/langtools/tools/javac/capture/Martin.java
index 05052fdb1e188..472b5f1c2391d 100644
--- a/test/langtools/tools/javac/capture/Martin.java
+++ b/test/langtools/tools/javac/capture/Martin.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 public class Martin {
-    public static void main(String[] args) throws Throwable {
+    public static void meth() {
         List<?> x1 = null;
         List<?> x2 = null;
         x1.addAll(x2);
diff --git a/test/langtools/tools/javac/defaultMethods/private/Private06.java b/test/langtools/tools/javac/defaultMethods/private/Private06.java
index 338741d558bdc..6a3c6438ad772 100644
--- a/test/langtools/tools/javac/defaultMethods/private/Private06.java
+++ b/test/langtools/tools/javac/defaultMethods/private/Private06.java
@@ -17,14 +17,14 @@ interface FI {
         void foo(NAFI nafi);
     }
 
-    public static void main(String [] args) {
+    public static void meth() {
         Private06.NAFI nafi = () -> {};
         Private06.FI fi = Private06.NAFI::foo; // OK.
     }
 }
 
 class Private06_01 {
-    public static void main(String [] args) {
+    public static void meth() {
         Private06.FI fi = Private06.NAFI::foo; // NOT OK.
     }
 }
diff --git a/test/langtools/tools/javac/defaultMethods/static/Static02.java b/test/langtools/tools/javac/defaultMethods/static/Static02.java
index da01aa7ee6e31..2f27479c27ee8 100644
--- a/test/langtools/tools/javac/defaultMethods/static/Static02.java
+++ b/test/langtools/tools/javac/defaultMethods/static/Static02.java
@@ -11,7 +11,7 @@ interface I {
         public static void test() { }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         I.test(); //ok
         I i = new I() {};
         i.test(); //no!
diff --git a/test/langtools/tools/javac/depDocComment/DeprecatedDocComment.java b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment.java
index 51f2f4a25d636..5ee0317fbdff8 100644
--- a/test/langtools/tools/javac/depDocComment/DeprecatedDocComment.java
+++ b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment.java
@@ -23,7 +23,7 @@
 
 public class DeprecatedDocComment {
 
-    public static void main(String argv[]) {
+    public static void meth() {
       DeprecatedDocComment2.deprecatedTest1();
       DeprecatedDocComment2.deprecatedTest2();
       DeprecatedDocComment2.deprecatedTest3();
diff --git a/test/langtools/tools/javac/generics/6245699/T6245699b.java b/test/langtools/tools/javac/generics/6245699/T6245699b.java
index 8aafcf4e0d167..0e95c93e81e36 100644
--- a/test/langtools/tools/javac/generics/6245699/T6245699b.java
+++ b/test/langtools/tools/javac/generics/6245699/T6245699b.java
@@ -6,7 +6,7 @@
  */
 
 public class T6245699b {
-    public static void main(String[] args) {
+    public static void meth() {
         IBar b = new Bar();
         String x = b.doIt();
     }
diff --git a/test/langtools/tools/javac/generics/6413682/T6413682.java b/test/langtools/tools/javac/generics/6413682/T6413682.java
index f1d7dabf78e41..74574ed762b0c 100644
--- a/test/langtools/tools/javac/generics/6413682/T6413682.java
+++ b/test/langtools/tools/javac/generics/6413682/T6413682.java
@@ -6,7 +6,7 @@
  */
 
 public class T6413682 {
-    public static void main(String... args) {
+    public static void meth() {
         Object[] text = new
 <Wow,thanks.Mr<List>,and.thanks.Mr<Javac>.Vince>Object[5];
     }
diff --git a/test/langtools/tools/javac/generics/6495506/T6495506.java b/test/langtools/tools/javac/generics/6495506/T6495506.java
index 1f8ed916f89a6..7fab9357b601f 100644
--- a/test/langtools/tools/javac/generics/6495506/T6495506.java
+++ b/test/langtools/tools/javac/generics/6495506/T6495506.java
@@ -7,7 +7,7 @@
  */
 
 public class T6495506 {
-    public static void main(String... args) {
+    public static void meth() {
         a.A myA = new a.A();
         myA.p = myA.vec.get(0);
     }
diff --git a/test/langtools/tools/javac/generics/6723444/T6723444.java b/test/langtools/tools/javac/generics/6723444/T6723444.java
index 6e325658c33b3..9bf7365dead18 100644
--- a/test/langtools/tools/javac/generics/6723444/T6723444.java
+++ b/test/langtools/tools/javac/generics/6723444/T6723444.java
@@ -23,7 +23,7 @@ <X extends Throwable> T6723444(Foo<X> foo)
     <X1 extends Throwable, X2 extends Throwable> T6723444(Foo<X1> foo, int i)
         throws X1, X2 {}
 
-    public static void main(String[] args) throws Exception {
+    public static void meth() throws Exception {
 
         // the following 8 statements should compile without error
 
diff --git a/test/langtools/tools/javac/generics/GetClass.java b/test/langtools/tools/javac/generics/GetClass.java
index 0321f3d535de5..0571daacfac6f 100644
--- a/test/langtools/tools/javac/generics/GetClass.java
+++ b/test/langtools/tools/javac/generics/GetClass.java
@@ -8,7 +8,7 @@
  */
 
 public class GetClass {
-    public static void main(String[] args) {
+    public static void meth() {
         Class<? extends Class<GetClass>> x = GetClass.class.getClass();
     }
 }
diff --git a/test/langtools/tools/javac/generics/Nonlinear.java b/test/langtools/tools/javac/generics/Nonlinear.java
index 36004a0790769..8bf88c07ca26d 100644
--- a/test/langtools/tools/javac/generics/Nonlinear.java
+++ b/test/langtools/tools/javac/generics/Nonlinear.java
@@ -21,7 +21,7 @@ public class Nonlinear {
     // when executed, even though there are no explicit casts in
     // the program.
 
-    public static void main (String [] args) {
+    public static void meth() {
         Integer x = Integer.valueOf(5);
         String y = castit (x);
         System.out.println (y);
diff --git a/test/langtools/tools/javac/generics/UnsoundInference.java b/test/langtools/tools/javac/generics/UnsoundInference.java
index d2b3693a8f7f1..5b3f0909144db 100644
--- a/test/langtools/tools/javac/generics/UnsoundInference.java
+++ b/test/langtools/tools/javac/generics/UnsoundInference.java
@@ -12,7 +12,7 @@
 
 public class UnsoundInference {
 
-    public static void main(String[] args) {
+    public static void meth() {
         Object[] objArray = {new Object()};
         ArrayList<String> strList = new ArrayList<String>();
         transferBug(objArray, strList);
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg08.java b/test/langtools/tools/javac/generics/diamond/neg/Neg08.java
index e85e018425ed0..cbdaf07412e39 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg08.java
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg08.java
@@ -9,7 +9,7 @@
  */
 
 class Neg08 {
-   public static void main(String[] args) {
+   public static void meth() {
      String s = new String<>("foo");
    }
 }
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg13.java b/test/langtools/tools/javac/generics/diamond/neg/Neg13.java
index 45c6ecaae9803..9d4c1a8822bf0 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg13.java
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg13.java
@@ -15,7 +15,7 @@ static abstract class A<T> {
 
     static void foo(A<String> as) {}
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         // Method invocation context - good <>(){}
         foo(new A<>() {
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg14.java b/test/langtools/tools/javac/generics/diamond/neg/Neg14.java
index 0ad9114c784d1..d66071a74ede4 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg14.java
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg14.java
@@ -15,7 +15,7 @@ static interface A<T> {
 
     static void foo(A<String> as) {}
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         // Method invocation context - good <>(){}
         foo(new A<>() {
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg15.java b/test/langtools/tools/javac/generics/diamond/neg/Neg15.java
index 573a5a1be3c39..1bfca0a6e8133 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg15.java
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg15.java
@@ -23,7 +23,7 @@ static void someMethod(Predicate<? extends Number> p) {
             throw new Error("Blew it");
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         someMethod(new Predicate<Integer>() {
             public boolean test(Integer n) {
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg17.java b/test/langtools/tools/javac/generics/diamond/neg/Neg17.java
index 960fbd77a634f..b82ec463129de 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg17.java
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg17.java
@@ -11,7 +11,7 @@ abstract class Neg17<T> {
 
    abstract void m();
 
-   public static void main(String[] args) {
+   void meth() {
        Collections.singletonList(new Neg17<>() { void m() {} }).get(0).m(); // good.
        Collections.singletonList(new Neg17<>() {
                  void m() {}
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg18.java b/test/langtools/tools/javac/generics/diamond/neg/Neg18.java
index 4acb7ef2f09c4..b02164af82bf2 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg18.java
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg18.java
@@ -10,7 +10,7 @@
 
 class Neg18 {
 
-   public static void main(String[] args) {
+   public static void meth() {
         new Neg18_01<>() {};
    }
 }
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg19.java b/test/langtools/tools/javac/generics/diamond/neg/Neg19.java
index 173a72a8db967..e3b6d4f5e0493 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg19.java
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg19.java
@@ -8,7 +8,7 @@
 
 
 class Neg19 {
-    public static void main(String[] args) {
+    public static void meth() {
         new Neg19_01<Neg19>().foo(new Neg19_01<>()); // OK.
         new Neg19_01<Neg19>().foo(new Neg19_01<>() {}); // ERROR.
     }
diff --git a/test/langtools/tools/javac/generics/inference/4972073/T4972073.java b/test/langtools/tools/javac/generics/inference/4972073/T4972073.java
index 8a6dd65f1e781..2fffa48e86822 100644
--- a/test/langtools/tools/javac/generics/inference/4972073/T4972073.java
+++ b/test/langtools/tools/javac/generics/inference/4972073/T4972073.java
@@ -22,9 +22,4 @@ public String foo() {
     }
 
     static class B<E extends MyClass & MyInterface<E> & MyInterface<E>> extends D {}
-
-
-    public static void main(String[] args) {
-        B b = new B<Sun1>();
-    }
 }
diff --git a/test/langtools/tools/javac/generics/inference/5081782/Neg.java b/test/langtools/tools/javac/generics/inference/5081782/Neg.java
index f886905994400..eedee463f23a8 100644
--- a/test/langtools/tools/javac/generics/inference/5081782/Neg.java
+++ b/test/langtools/tools/javac/generics/inference/5081782/Neg.java
@@ -8,7 +8,7 @@
 
 public class Neg {
     static void m() {}
-    public static void main(String... args) {
+    public static void meth() {
         Neg.<Can,I,write,a,little,story,here>m();
     }
 }
diff --git a/test/langtools/tools/javac/generics/odersky/BadTest.java b/test/langtools/tools/javac/generics/odersky/BadTest.java
index 427a733e7a90b..0f6b15061174e 100644
--- a/test/langtools/tools/javac/generics/odersky/BadTest.java
+++ b/test/langtools/tools/javac/generics/odersky/BadTest.java
@@ -15,7 +15,7 @@ static class Main {
         static <A> Cell<A> makeCell(A x) { return new Cell<A>(x); }
         static <A> A id(A x) { return x; }
 
-        public static void main(String[] args) {
+        public static void meth() {
             List<Cell<String>> as = nil().prepend(makeCell(null));
             List<Cell<String>> bs = cons(makeCell(null), nil());
             List<String> xs = id(nil());
diff --git a/test/langtools/tools/javac/generics/odersky/BadTest3.java b/test/langtools/tools/javac/generics/odersky/BadTest3.java
index 81f9c73775195..c6f54c66eb392 100644
--- a/test/langtools/tools/javac/generics/odersky/BadTest3.java
+++ b/test/langtools/tools/javac/generics/odersky/BadTest3.java
@@ -27,7 +27,7 @@ static class Main {
         static <A> Cell<A> makeCell(A x) { return new Cell<A>(x); }
         static <A> A id(A x) { return x; }
 
-        public static void main(String[] args) {
+        public static void meth() {
             List<String> xs = nil();
             f(null);
             f(nil());
diff --git a/test/langtools/tools/javac/generics/typeargs/Metharg1.java b/test/langtools/tools/javac/generics/typeargs/Metharg1.java
index d32641267277c..8cb95026542cc 100644
--- a/test/langtools/tools/javac/generics/typeargs/Metharg1.java
+++ b/test/langtools/tools/javac/generics/typeargs/Metharg1.java
@@ -32,10 +32,4 @@ <A> T() {
     <K> void f(K k) {
         this.<Integer>f("");
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>();
-        T<Integer>.U<Float> y = x.new <Object>U<Float>();
-        x.<Object>f("");
-    }
 }
diff --git a/test/langtools/tools/javac/generics/typeargs/Metharg2.java b/test/langtools/tools/javac/generics/typeargs/Metharg2.java
index 2f0d2c3f0e3d9..239d1f2af1e58 100644
--- a/test/langtools/tools/javac/generics/typeargs/Metharg2.java
+++ b/test/langtools/tools/javac/generics/typeargs/Metharg2.java
@@ -33,7 +33,7 @@ <K> void f(K k) {
         this.<Object>f("");
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         T<Integer> x = new <Object>T<Integer>();
         T<Integer>.U<Float> y = x.new <Object>U<Float>();
         x.<Integer>f("");
diff --git a/test/langtools/tools/javac/generics/typeargs/Newarg1.java b/test/langtools/tools/javac/generics/typeargs/Newarg1.java
index 42f841649659c..d44684d037bb1 100644
--- a/test/langtools/tools/javac/generics/typeargs/Newarg1.java
+++ b/test/langtools/tools/javac/generics/typeargs/Newarg1.java
@@ -14,7 +14,7 @@ class T<X> {
     <K> T(K x) {
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         new <Integer>T<Float>("");
     }
 }
diff --git a/test/langtools/tools/javac/generics/typeargs/Newarg2.java b/test/langtools/tools/javac/generics/typeargs/Newarg2.java
index d23a794c8f6aa..8794b722093b4 100644
--- a/test/langtools/tools/javac/generics/typeargs/Newarg2.java
+++ b/test/langtools/tools/javac/generics/typeargs/Newarg2.java
@@ -15,7 +15,7 @@ class U<Y> extends T {
         <B> U(B b) {}
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         new T().new <Integer>U<Integer>("");
     }
 }
diff --git a/test/langtools/tools/javac/generics/typeargs/Superarg1.java b/test/langtools/tools/javac/generics/typeargs/Superarg1.java
index e1dae6a45dfed..6cb00eca5b736 100644
--- a/test/langtools/tools/javac/generics/typeargs/Superarg1.java
+++ b/test/langtools/tools/javac/generics/typeargs/Superarg1.java
@@ -32,10 +32,4 @@ <A> T(A a) {
     <K> void f() {
         this.<Object>f();
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>("");
-        T<Integer>.U<Float> y = x.new <Object>U<Float>();
-        x.<Object>f();
-    }
 }
diff --git a/test/langtools/tools/javac/generics/typeargs/Superarg2.java b/test/langtools/tools/javac/generics/typeargs/Superarg2.java
index 6247695103114..d10ce114868d0 100644
--- a/test/langtools/tools/javac/generics/typeargs/Superarg2.java
+++ b/test/langtools/tools/javac/generics/typeargs/Superarg2.java
@@ -32,10 +32,4 @@ <A> T() {
     <K> void f() {
         this.<Object>f();
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>();
-        T<Integer>.U<Float> y = x.new <Object>U<Float>("");
-        x.<Object>f();
-    }
 }
diff --git a/test/langtools/tools/javac/generics/typeargs/ThisArg.java b/test/langtools/tools/javac/generics/typeargs/ThisArg.java
index c2cf7f43b226e..a4a447d3841c1 100644
--- a/test/langtools/tools/javac/generics/typeargs/ThisArg.java
+++ b/test/langtools/tools/javac/generics/typeargs/ThisArg.java
@@ -32,10 +32,4 @@ <A> T() {
     <K> void f() {
         this.<Object>f();
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>();
-        T<Integer>.U<Float> y = x.new <Object>U<Float>("");
-        x.<Object>f();
-    }
 }
diff --git a/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
index f3bf10f79d4aa..e380be8832ae2 100644
--- a/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
+++ b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
@@ -10,7 +10,7 @@
  */
 
 public class T6437894 {
-    public static void main(String... args) {
+    public static void meth() {
         b.B m;
         a.A.X x = null;
         Long.parseLong(x.toString());
diff --git a/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java
index 558fe61c90e0f..e7e2972d32069 100644
--- a/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java
+++ b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java
@@ -7,7 +7,7 @@
 
 public class AssignmentDifferentTypes {
 
-    public static void main(String[] args) {
+    public static void meth() {
         Ref<Der> derexact = null;
         Ref<Base> baseexact = null;
         Ref<? extends Der> derext = null;
diff --git a/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java
index 39058ac810620..434aac431aa2d 100644
--- a/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java
+++ b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java
@@ -7,7 +7,7 @@
 
 public class AssignmentSameType {
 
-    public static void main(String[] args) {
+    public static void meth() {
         Ref<B> exact = null;
         Ref<? extends B> ebound = null;
         Ref<? super B> sbound = null;
diff --git a/test/langtools/tools/javac/generics/wildcards/T6450290.java b/test/langtools/tools/javac/generics/wildcards/T6450290.java
index 330922fffb38b..d9d1f0099b68d 100644
--- a/test/langtools/tools/javac/generics/wildcards/T6450290.java
+++ b/test/langtools/tools/javac/generics/wildcards/T6450290.java
@@ -14,7 +14,7 @@ static class Box<X extends Box<?,?>, T extends X> {
 
     static class A extends Box<A,A> {}
     static class B extends Box<B,B> {}
-    public static void main(String[] args) {
+    public static void meth() {
         Box<?,?> b = new Box<Box<A,A>,Box<A,A>>();
         b.value.same = new Box<B,B>(); //javac misses this bad assignment
     }
diff --git a/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.java b/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.java
index 1c9a299e26698..f7cbdd94dc53a 100644
--- a/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.java
+++ b/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.java
@@ -24,9 +24,4 @@ void f() {
             System.out.println("ok");
         }
     }
-    public static void main(String[] args) {
-        NewBeforeOuterConstructed2 c = new NewBeforeOuterConstructed2(new Object());
-        Middle m = c.new Middle();
-        m.f();
-    }
 }
diff --git a/test/langtools/tools/javac/lambda/8071432/T8071432.java b/test/langtools/tools/javac/lambda/8071432/T8071432.java
index 15f781e99d84c..11d281287b0f9 100644
--- a/test/langtools/tools/javac/lambda/8071432/T8071432.java
+++ b/test/langtools/tools/javac/lambda/8071432/T8071432.java
@@ -41,7 +41,7 @@ public String toString() {
         }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         Collection<Point> c = Arrays.asList(new Point(1.0, 0.1));
         System.out.println("------- 1 ---------------");
         System.out.println(c.stream().reduce(0.0,
diff --git a/test/langtools/tools/javac/lambda/LambdaConv10.java b/test/langtools/tools/javac/lambda/LambdaConv10.java
index cc11f967f1991..d71eb26576c31 100644
--- a/test/langtools/tools/javac/lambda/LambdaConv10.java
+++ b/test/langtools/tools/javac/lambda/LambdaConv10.java
@@ -11,7 +11,7 @@ class LambdaConv10 {
 
     interface Method1<R, A1> { public R call( A1 a1 ); }
 
-    public static void main( final String... notUsed ) {
+    public static void meth() {
         Method1<Integer,Integer> m1 = (int i) -> 2 * i;
     }
 }
diff --git a/test/langtools/tools/javac/lambda/MethodReference20.java b/test/langtools/tools/javac/lambda/MethodReference20.java
index e37ac797242f9..53f64fdd115ac 100644
--- a/test/langtools/tools/javac/lambda/MethodReference20.java
+++ b/test/langtools/tools/javac/lambda/MethodReference20.java
@@ -17,7 +17,7 @@ interface SAM<Z> {
 
     static void test(SAM<Integer> s) {   }
 
-    public static void main(String[] args) {
+    public static void meth() {
         SAM<Integer> s = MethodReference20<String>::new;
         test(MethodReference20<String>::new);
     }
diff --git a/test/langtools/tools/javac/lambda/MethodReference25.java b/test/langtools/tools/javac/lambda/MethodReference25.java
index ffd673b50f91f..20f4ef6345735 100644
--- a/test/langtools/tools/javac/lambda/MethodReference25.java
+++ b/test/langtools/tools/javac/lambda/MethodReference25.java
@@ -21,7 +21,7 @@ interface SAM2 {
     static void call(int i, SAM1 s) { s.m(i);  }
     static void call(int i, SAM2 s) { s.m(i);  }
 
-    public static void main(String[] args) {
+    public static void meth() {
         call(1, MethodReference25::m); //ambiguous
     }
 }
diff --git a/test/langtools/tools/javac/lambda/MethodReference41.java b/test/langtools/tools/javac/lambda/MethodReference41.java
index c1c96efeb8466..72b2b4485fbc0 100644
--- a/test/langtools/tools/javac/lambda/MethodReference41.java
+++ b/test/langtools/tools/javac/lambda/MethodReference41.java
@@ -34,7 +34,7 @@ static void m4(SAM1 s) { }
     static void m4(SAM2 s) { }
     static void m4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         m1(Foo::new);
         m2(Foo::new);
         m3(Foo::new);
diff --git a/test/langtools/tools/javac/lambda/MethodReference42.java b/test/langtools/tools/javac/lambda/MethodReference42.java
index 61bef68c770b6..b528582d23697 100644
--- a/test/langtools/tools/javac/lambda/MethodReference42.java
+++ b/test/langtools/tools/javac/lambda/MethodReference42.java
@@ -34,7 +34,7 @@ static void m4(SAM1 s) { }
     static void m4(SAM2 s) { }
     static void m4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         m1(Foo::new);
         m2(Foo::new);
         m3(Foo::new);
diff --git a/test/langtools/tools/javac/lambda/MethodReference43.java b/test/langtools/tools/javac/lambda/MethodReference43.java
index e48ba12adea5e..3e3789fa0e742 100644
--- a/test/langtools/tools/javac/lambda/MethodReference43.java
+++ b/test/langtools/tools/javac/lambda/MethodReference43.java
@@ -41,7 +41,7 @@ static void m5(SAM2 s) { }
     static void m5(SAM3 s) { }
     static void m5(SAM4 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         m1(Foo::new);
         m2(Foo::new);
         m3(Foo::new);
diff --git a/test/langtools/tools/javac/lambda/MethodReference44.java b/test/langtools/tools/javac/lambda/MethodReference44.java
index 3a62d84657aec..7ed6ac9fe8f16 100644
--- a/test/langtools/tools/javac/lambda/MethodReference44.java
+++ b/test/langtools/tools/javac/lambda/MethodReference44.java
@@ -36,7 +36,7 @@ static void g4(SAM1 s) { }
     static void g4(SAM2 s) { }
     static void g4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(MethodReference44::m);
         g2(MethodReference44::m);
         g3(MethodReference44::m);
diff --git a/test/langtools/tools/javac/lambda/MethodReference46.java b/test/langtools/tools/javac/lambda/MethodReference46.java
index 874c4eb5ca397..e7a4e6dfee38a 100644
--- a/test/langtools/tools/javac/lambda/MethodReference46.java
+++ b/test/langtools/tools/javac/lambda/MethodReference46.java
@@ -36,7 +36,7 @@ static void g4(SAM1 s) { }
     static void g4(SAM2 s) { }
     static void g4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(MethodReference46::m);
         g2(MethodReference46::m);
         g3(MethodReference46::m);
diff --git a/test/langtools/tools/javac/lambda/MethodReference47.java b/test/langtools/tools/javac/lambda/MethodReference47.java
index d5fff0dd4b444..29fcef2ba9b23 100644
--- a/test/langtools/tools/javac/lambda/MethodReference47.java
+++ b/test/langtools/tools/javac/lambda/MethodReference47.java
@@ -25,7 +25,7 @@ static void g1(SAM1 s) { }
     static void g2(SAM1 s) { }
     static void g2(SAM2 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(MethodReference47::m);
         g2(MethodReference47::m);
     }
diff --git a/test/langtools/tools/javac/lambda/MethodReference48.java b/test/langtools/tools/javac/lambda/MethodReference48.java
index 153ec9007004c..95ae39ed788b7 100644
--- a/test/langtools/tools/javac/lambda/MethodReference48.java
+++ b/test/langtools/tools/javac/lambda/MethodReference48.java
@@ -34,7 +34,7 @@ static void g4(SAM1 s) { } //return type not compatible
     static void g4(SAM2 s) { } //ok
     static void g4(SAM3 s) { } //ok
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(Foo::m);
         g2(Foo::m);
         g3(Foo::m);
diff --git a/test/langtools/tools/javac/lambda/MethodReference60.java b/test/langtools/tools/javac/lambda/MethodReference60.java
index 4209e1b9a3285..d4ed66fde2785 100644
--- a/test/langtools/tools/javac/lambda/MethodReference60.java
+++ b/test/langtools/tools/javac/lambda/MethodReference60.java
@@ -22,7 +22,7 @@ interface BadArrayFactory3<X> {
         X make(String s);
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         BadArrayFactory1<int[]> factory1 = int[]::new; //param mismatch
         BadArrayFactory2<int[]> factory2 = int[]::new; //param mismatch
         BadArrayFactory3<int[]> factory3 = int[]::new; //param mismatch
diff --git a/test/langtools/tools/javac/lambda/MostSpecific04.java b/test/langtools/tools/javac/lambda/MostSpecific04.java
index 363661964adeb..2663e0d9060af 100644
--- a/test/langtools/tools/javac/lambda/MostSpecific04.java
+++ b/test/langtools/tools/javac/lambda/MostSpecific04.java
@@ -20,7 +20,7 @@ void map(DoubleMapper<? super E> m) { }
         void map(LongMapper<? super E> m) { }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         MyList<String> ls = new MyList<String>();
         ls.map(e->e.length()); //ambiguous - implicit
         ls.map((String e)->e.length()); //ok
diff --git a/test/langtools/tools/javac/lambda/MostSpecific05.java b/test/langtools/tools/javac/lambda/MostSpecific05.java
index 345578b509de9..34d439d6a7893 100644
--- a/test/langtools/tools/javac/lambda/MostSpecific05.java
+++ b/test/langtools/tools/javac/lambda/MostSpecific05.java
@@ -20,7 +20,7 @@ void map(ObjectConverter<? extends A> m) { }
         void map(NumberConverter<? extends B> m) { }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         MyMapper<Number, Double> mm = new MyMapper<Number, Double>();
         mm.map(e->1.0); //ambiguous - implicit
         mm.map((Object e)->1.0); //ok
diff --git a/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java
index 2375733dea05a..a2f618b02028c 100644
--- a/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java
+++ b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java
@@ -9,7 +9,7 @@
 
 public class LambdaTest2_neg1 {
 
-    public static void main(String[] args) {
+    public static void meth() {
         LambdaTest2_neg1 test = new LambdaTest2_neg1();
         //not convertible - QooRoo is not a SAM
         test.methodQooRoo((Integer i) -> { });
diff --git a/test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java
index 61cd10b4dc7b0..8b119dea28b49 100644
--- a/test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java
+++ b/test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java
@@ -13,7 +13,7 @@ interface SAM<T> {
 
     static <T> SAM<T> infmethod(SAM<T> t) { return t; }
 
-    public static void main(String argv[]) {
+    public static void meth() {
         SAM<Object> s = infmethod(int::new);
         s.m();
     }
diff --git a/test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java
index 39b81f1b2e9fa..c0a7ab3929c01 100644
--- a/test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java
+++ b/test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java
@@ -17,7 +17,7 @@ class TestString {
     }
 }
 public class MethodRefToInnerWithoutOuter extends MethodRefToInnerBase {
-    public static void main(String[] args) {
+    public static void meth() {
         List<String> list = new ArrayList<>();
         list.stream().forEach(TestString::new);
     }
diff --git a/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java
index f5f2993aa853d..e86f2e67d9bd6 100644
--- a/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java
+++ b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java
@@ -13,7 +13,7 @@ interface Setter {
       int apply(int[] arr, int idx, int val);
   }
 
-  public static void main(String[] args) {
+  public static void meth() {
       VarHandle vh = MethodHandles.arrayElementVarHandle(int[].class);
 
       // Return type of Setter::apply does not match return type of VarHandle::set
diff --git a/test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java
index 3d77c95fd5ab1..c85a61a1fbf3a 100644
--- a/test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java
+++ b/test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java
@@ -9,7 +9,7 @@
 
 public class InferenceTest_neg1_2 {
 
-    public static void main(String[] args) {
+    public static void meth() {
         InferenceTest_neg1_2 test = new InferenceTest_neg1_2();
         test.method(n -> null); //method 1-5 all match
         test.method(n -> "a"); //method 2, 4 match
diff --git a/test/langtools/tools/javac/limits/ArrayDims1.java b/test/langtools/tools/javac/limits/ArrayDims1.java
index a68d65f18ac3b..5b0e5f29d2e89 100644
--- a/test/langtools/tools/javac/limits/ArrayDims1.java
+++ b/test/langtools/tools/javac/limits/ArrayDims1.java
@@ -58,6 +58,4 @@ class ArrayDims1 {
         [][][][][][][][][][]
         [][][][][][][][][][]
         [][][][][] o; // 255 = limit (OK)
-    public static void main(String[] args) {
-    }
 }
diff --git a/test/langtools/tools/javac/limits/ArrayDims2.java b/test/langtools/tools/javac/limits/ArrayDims2.java
index 947fba8b850ef..67296dc5e8618 100644
--- a/test/langtools/tools/javac/limits/ArrayDims2.java
+++ b/test/langtools/tools/javac/limits/ArrayDims2.java
@@ -35,6 +35,4 @@ class ArrayDims2 {
         [][][][][][][][][][]
         [][][][][][][][][][]
         [][][][][][] o; // 256 = too many
-    public static void main(String[] args) {
-    }
 }
diff --git a/test/langtools/tools/javac/limits/ArrayDims3.java b/test/langtools/tools/javac/limits/ArrayDims3.java
index 051beef028c80..ad5f34976ce38 100644
--- a/test/langtools/tools/javac/limits/ArrayDims3.java
+++ b/test/langtools/tools/javac/limits/ArrayDims3.java
@@ -58,6 +58,4 @@ class ArrayDims3 {
         [][][][][][][][][][]
         [][][][][][][][][][]
         [][][][][]; // 255 = limit (OK)
-    public static void main(String[] args) {
-    }
 }
diff --git a/test/langtools/tools/javac/limits/ArrayDims4.java b/test/langtools/tools/javac/limits/ArrayDims4.java
index 31a3f1a719de0..7a9f83a8f66ba 100644
--- a/test/langtools/tools/javac/limits/ArrayDims4.java
+++ b/test/langtools/tools/javac/limits/ArrayDims4.java
@@ -35,6 +35,4 @@ class ArrayDims4 {
         [][][][][][][][][][]
         [][][][][][][][][][]
         [][][][][][]; // 256 = too many
-    public static void main(String[] args) {
-    }
 }
diff --git a/test/langtools/tools/javac/limits/PoolSize2.java b/test/langtools/tools/javac/limits/PoolSize2.java
index d5f946ca727ce..6cc529c31fece 100644
--- a/test/langtools/tools/javac/limits/PoolSize2.java
+++ b/test/langtools/tools/javac/limits/PoolSize2.java
@@ -3331,6 +3331,4 @@ static void m7() {
             ,32762.0,32763.0,32764.0,32765.0,32766.0,32767.0
         };
     }
-    public static void main(String args[]) {
-    System.out.println("Ok"); }
 }
diff --git a/test/langtools/tools/javac/limits/StringLength.java b/test/langtools/tools/javac/limits/StringLength.java
index b7ce4d116d480..be17379406c5f 100644
--- a/test/langtools/tools/javac/limits/StringLength.java
+++ b/test/langtools/tools/javac/limits/StringLength.java
@@ -20,7 +20,4 @@ class StringLength {
 
     public static final String l65530 = l6e4 + l5e3 + l5e2 + l3e1;
     public static String X = l65530 + "abcdef"; // length 65536
-    public static void main(String[] args) {
-        System.out.println(X.length());
-    }
 }
diff --git a/test/langtools/tools/javac/nested/5009484/X.java b/test/langtools/tools/javac/nested/5009484/X.java
index b35f5584824ce..06718d8640442 100644
--- a/test/langtools/tools/javac/nested/5009484/X.java
+++ b/test/langtools/tools/javac/nested/5009484/X.java
@@ -11,7 +11,7 @@ public class X<T> {
    X(T t) {
        this.t = t;
    }
-   public static void main(String[] args) {
+   public static void meth() {
        new X<String>("OUTER").bar();
    }
    void bar() {
diff --git a/test/langtools/tools/javac/overload/T5090220.java b/test/langtools/tools/javac/overload/T5090220.java
index 96a897e2fae91..c9b39ef22d13b 100644
--- a/test/langtools/tools/javac/overload/T5090220.java
+++ b/test/langtools/tools/javac/overload/T5090220.java
@@ -12,7 +12,7 @@ static void foo(int i1, Integer i2) {
     static void foo(Integer i1, double d) {
         System.out.println("double");
     }
-    public static void main(String[] args) {
+    public static void meth() {
         foo(5, 5);
     }
 }
diff --git a/test/langtools/tools/javac/patterns/BindingsTest1Merging.java b/test/langtools/tools/javac/patterns/BindingsTest1Merging.java
index f6e1f6dd201af..f9262ae385c52 100644
--- a/test/langtools/tools/javac/patterns/BindingsTest1Merging.java
+++ b/test/langtools/tools/javac/patterns/BindingsTest1Merging.java
@@ -7,7 +7,7 @@
 
 public class BindingsTest1Merging {
     public static boolean Ktrue() { return true; }
-    public static void main(String[] args) {
+    public static void meth() {
         Object o1 = "hello";
         Integer i = 42;
         Object o2 = i;
diff --git a/test/langtools/tools/javac/patterns/BindingsTest2.java b/test/langtools/tools/javac/patterns/BindingsTest2.java
index d3247ea427321..b9bd372ddc84e 100644
--- a/test/langtools/tools/javac/patterns/BindingsTest2.java
+++ b/test/langtools/tools/javac/patterns/BindingsTest2.java
@@ -6,7 +6,7 @@
  */
 public class BindingsTest2 {
     public static boolean Ktrue() { return true; }
-    public static void main(String[] args) {
+    public static void meth() {
         Object o1 = "hello";
         Integer in = 42;
         Object o2 = in;
diff --git a/test/langtools/tools/javac/patterns/CastConversionMatch.java b/test/langtools/tools/javac/patterns/CastConversionMatch.java
index a6dde44208227..ec249afee52d8 100644
--- a/test/langtools/tools/javac/patterns/CastConversionMatch.java
+++ b/test/langtools/tools/javac/patterns/CastConversionMatch.java
@@ -6,7 +6,7 @@
  */
 
 public class CastConversionMatch {
-    public static void main(String [] args) {
+    public static void meth() {
         Object o = 42;
         if (o instanceof int s) {
             System.out.println("Okay");
diff --git a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java
index 7c7d8a90a74c6..2a486c8042d72 100644
--- a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java
+++ b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java
@@ -9,7 +9,7 @@
 
 public class DeconstructionPatternErrors {
 
-    public static void main(String... args) throws Throwable {
+    public static void meth() throws Throwable {
         Object p;
         p = new P(42);
         if (p instanceof P(_));
diff --git a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out
index d4fbf80b199dd..8fba5a322141a 100644
--- a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out
+++ b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out
@@ -20,8 +20,8 @@ DeconstructionPatternErrors.java:27:29: compiler.err.instanceof.reifiable.not.sa
 DeconstructionPatternErrors.java:28:44: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer)
 DeconstructionPatternErrors.java:28:13: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
 DeconstructionPatternErrors.java:29:40: compiler.err.match.binding.exists
-DeconstructionPatternErrors.java:30:56: compiler.err.already.defined: kindname.variable, v1, kindname.method, main(java.lang.String...)
-DeconstructionPatternErrors.java:30:64: compiler.err.already.defined: kindname.variable, v2, kindname.method, main(java.lang.String...)
+DeconstructionPatternErrors.java:30:56: compiler.err.already.defined: kindname.variable, v1, kindname.method, meth()
+DeconstructionPatternErrors.java:30:64: compiler.err.already.defined: kindname.variable, v2, kindname.method, meth()
 DeconstructionPatternErrors.java:31:29: compiler.err.prob.found.req: (compiler.misc.not.applicable.types: int, byte)
 DeconstructionPatternErrors.java:32:29: compiler.err.prob.found.req: (compiler.misc.not.applicable.types: int, long)
 DeconstructionPatternErrors.java:34:21: compiler.err.prob.found.req: (compiler.misc.not.applicable.types: int, byte)
diff --git a/test/langtools/tools/javac/patterns/EnsureTypesOrderTest.java b/test/langtools/tools/javac/patterns/EnsureTypesOrderTest.java
index 5c18fd750ca90..b2f01d20128d7 100644
--- a/test/langtools/tools/javac/patterns/EnsureTypesOrderTest.java
+++ b/test/langtools/tools/javac/patterns/EnsureTypesOrderTest.java
@@ -5,7 +5,7 @@
  * @compile/fail/ref=EnsureTypesOrderTest.out -XDrawDiagnostics EnsureTypesOrderTest.java
  */
 public class EnsureTypesOrderTest {
-    public static void main(String [] args) {
+    public static void meth(String[] args) {
         if (args instanceof String s) {
             System.out.println("Broken");
         }
diff --git a/test/langtools/tools/javac/patterns/ImpossibleTypeTest.java b/test/langtools/tools/javac/patterns/ImpossibleTypeTest.java
index 2c4ba47adeb27..2ff55f3f62565 100644
--- a/test/langtools/tools/javac/patterns/ImpossibleTypeTest.java
+++ b/test/langtools/tools/javac/patterns/ImpossibleTypeTest.java
@@ -6,7 +6,7 @@
  */
 public class ImpossibleTypeTest {
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         int in = 42;
         Integer i = 42;
diff --git a/test/langtools/tools/javac/patterns/MatchBindingScopeTest.java b/test/langtools/tools/javac/patterns/MatchBindingScopeTest.java
index 2e32428a67d68..d8251ff32a24e 100644
--- a/test/langtools/tools/javac/patterns/MatchBindingScopeTest.java
+++ b/test/langtools/tools/javac/patterns/MatchBindingScopeTest.java
@@ -11,7 +11,7 @@ public class MatchBindingScopeTest {
     static Object o1 = s;
     static Object o2 = i;
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         if (o1 instanceof String j && j.length() == 5) { // OK
             System.out.println(j); // OK
diff --git a/test/langtools/tools/javac/patterns/NullsInPatterns.java b/test/langtools/tools/javac/patterns/NullsInPatterns.java
index 5873886b2ed8f..9f9afd425e9b7 100644
--- a/test/langtools/tools/javac/patterns/NullsInPatterns.java
+++ b/test/langtools/tools/javac/patterns/NullsInPatterns.java
@@ -8,7 +8,7 @@
 
 public class NullsInPatterns {
 
-    public static void main(String[] args) {
+    public static void meth() {
         if (null instanceof List t) {
             throw new AssertionError("broken");
         } else {
diff --git a/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java b/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java
index 96cb69e802118..5129a15fe2042 100644
--- a/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java
+++ b/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java
@@ -5,7 +5,7 @@
  * @compile/fail/ref=PatternVariablesAreNonFinal.out -XDrawDiagnostics PatternVariablesAreNonFinal.java
  */
 public class PatternVariablesAreNonFinal {
-    public static void main(String[] args) {
+    public static void meth() {
         Object o = 32;
         if (o instanceof String s) {
             s = "hello again";
diff --git a/test/langtools/tools/javac/patterns/UncheckedWarningOnMatchesTest.java b/test/langtools/tools/javac/patterns/UncheckedWarningOnMatchesTest.java
index db0a58f5c414a..239b7c32fe1b4 100644
--- a/test/langtools/tools/javac/patterns/UncheckedWarningOnMatchesTest.java
+++ b/test/langtools/tools/javac/patterns/UncheckedWarningOnMatchesTest.java
@@ -8,7 +8,7 @@
 
 public class UncheckedWarningOnMatchesTest {
 
-    public static void main(String [] args) {
+    public static void meth() {
 
         Object o = new ArrayList<UncheckedWarningOnMatchesTest>();
         if (o instanceof ArrayList<Integer> ai) {  // unchecked conversion
diff --git a/test/langtools/tools/javac/scope/6225935/Estatico4.java b/test/langtools/tools/javac/scope/6225935/Estatico4.java
index c2b17d6cc0094..212791786db46 100644
--- a/test/langtools/tools/javac/scope/6225935/Estatico4.java
+++ b/test/langtools/tools/javac/scope/6225935/Estatico4.java
@@ -12,7 +12,7 @@
 
 public class Estatico4 {
 
-  public static void main(String[] s) {
+  public static void meth() {
     System.out.println(CENTER);
   }
 
diff --git a/test/langtools/tools/javac/staticImport/ImportPrivate.java b/test/langtools/tools/javac/staticImport/ImportPrivate.java
index b108d498f4ec7..3c53b20d696b1 100644
--- a/test/langtools/tools/javac/staticImport/ImportPrivate.java
+++ b/test/langtools/tools/javac/staticImport/ImportPrivate.java
@@ -18,7 +18,7 @@ private static int m() {
 }
 
 class MyTest {
-    public static void main(String argv[]) {
+    public static void meth() {
         m();
     }
 }
diff --git a/test/langtools/tools/javac/switchexpr/DefiniteAssignment2.java b/test/langtools/tools/javac/switchexpr/DefiniteAssignment2.java
index 61bfd2d916454..6abb0b81089ec 100644
--- a/test/langtools/tools/javac/switchexpr/DefiniteAssignment2.java
+++ b/test/langtools/tools/javac/switchexpr/DefiniteAssignment2.java
@@ -6,7 +6,7 @@
  */
 public class DefiniteAssignment2 {
 
-    public static void main(String[] args) {
+    public static void meth() {
         int a = 0;
         boolean b = true;
         boolean t;
diff --git a/test/langtools/tools/javac/switchexpr/ExpressionSwitchUnreachable.java b/test/langtools/tools/javac/switchexpr/ExpressionSwitchUnreachable.java
index 7ee015f59b4a9..ca1f3bac2734a 100644
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchUnreachable.java
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchUnreachable.java
@@ -7,7 +7,7 @@
 
 public class ExpressionSwitchUnreachable {
 
-    public static void main(String[] args) {
+    public static void meth() {
         int z = 42;
         int i = switch (z) {
             case 0 -> {
diff --git a/test/langtools/tools/javac/switchextra/DefiniteAssignment2.java b/test/langtools/tools/javac/switchextra/DefiniteAssignment2.java
index d3789419760d9..09a74cfb8f214 100644
--- a/test/langtools/tools/javac/switchextra/DefiniteAssignment2.java
+++ b/test/langtools/tools/javac/switchextra/DefiniteAssignment2.java
@@ -5,7 +5,7 @@
  */
 public class DefiniteAssignment2 {
 
-    public static void main(String[] args) {
+    public static void meth() {
         int a = 0;
         E e = E.A;
 
diff --git a/test/langtools/tools/javac/unicode/NonasciiDigit.java b/test/langtools/tools/javac/unicode/NonasciiDigit.java
index 9a585d06ad197..1e64e7ebdb8dc 100644
--- a/test/langtools/tools/javac/unicode/NonasciiDigit.java
+++ b/test/langtools/tools/javac/unicode/NonasciiDigit.java
@@ -7,7 +7,7 @@
  * @compile/fail/ref=NonasciiDigit.out -XDrawDiagnostics  NonasciiDigit.java
  */
 public class NonasciiDigit {
-    public static void main(String[] args) {
+    public static void meth() {
         // error: only ASCII allowed in constants
         int i1 = \uff11;
         int i2 = 1\uff11;
diff --git a/test/langtools/tools/javac/varargs/6313164/T7175433.java b/test/langtools/tools/javac/varargs/6313164/T7175433.java
index 4384cf5d9b97b..b9453319f9190 100644
--- a/test/langtools/tools/javac/varargs/6313164/T7175433.java
+++ b/test/langtools/tools/javac/varargs/6313164/T7175433.java
@@ -19,7 +19,7 @@ private class Foo { }
 
 public class T7175433 {
 
-    public static void main(String[] args) {
+    public static void meth() {
         Bar b = new Bar();
         b.m(b.getFoo());
     }
diff --git a/test/langtools/tools/javac/varargs/Warn2.java b/test/langtools/tools/javac/varargs/Warn2.java
index c4b32fc8bb09c..9ba8b8f883241 100644
--- a/test/langtools/tools/javac/varargs/Warn2.java
+++ b/test/langtools/tools/javac/varargs/Warn2.java
@@ -14,7 +14,7 @@
 class T {
     static void f(String fmt, Object... args) {}
 
-    public static void main(String[] args) {
+    public static void meth() {
         f("foo", null);
     }
 }