diff --git a/test/jdk/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java b/test/jdk/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java
index cb20a2f2732..91d277a2284 100644
--- a/test/jdk/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java
+++ b/test/jdk/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
   @summary Tests that windows are removed from owner's child windows list
   @modules java.desktop/java.awt:open
   @author art: area=awt.toplevel
-  @run main/othervm -mx128m OwnedWindowsLeak
+  @run main/othervm -Xmx128m OwnedWindowsLeak
 */
 
 import java.awt.Frame;
diff --git a/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java b/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java
index 4ec95fb7535..c16fe0e5a82 100644
--- a/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java
+++ b/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java
@@ -36,7 +36,7 @@ import javax.print.PrintServiceLookup;
  * @summary Tests custom class loader cleanup
  * @library /javax/swing/regtesthelpers
  * @build Util
- * @run main/timeout=60/othervm -mx32m FlushCustomClassLoader
+ * @run main/timeout=60/othervm -Xmx32m FlushCustomClassLoader
  */
 public final class FlushCustomClassLoader {
 
diff --git a/test/jdk/javax/sound/sampled/Clip/AudioContentHandlers.java b/test/jdk/javax/sound/sampled/Clip/AudioContentHandlers.java
index c287ee061db..cb0875a5320 100644
--- a/test/jdk/javax/sound/sampled/Clip/AudioContentHandlers.java
+++ b/test/jdk/javax/sound/sampled/Clip/AudioContentHandlers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ import static javax.sound.sampled.AudioFileFormat.Type.WAVE;
  * @test
  * @bug 8204454
  * @summary URL.getContent() should return AudioClip for supported formats
- * @run main/othervm -mx128m AudioContentHandlers
+ * @run main/othervm -Xmx128m AudioContentHandlers
  */
 public final class AudioContentHandlers {
 
diff --git a/test/jdk/javax/swing/JFileChooser/6396844/TwentyThousandTest.java b/test/jdk/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
index afc2fc41bc4..757d21278b1 100644
--- a/test/jdk/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
+++ b/test/jdk/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
  * @library ../../regtesthelpers
  * @modules java.desktop/sun.java2d
  * @build Util
- * @run main/othervm/timeout=1000 -mx128m TwentyThousandTest
+ * @run main/othervm/timeout=1000 -Xmx128m TwentyThousandTest
  */
 
 import sun.java2d.Disposer;
diff --git a/test/jdk/javax/swing/JOptionPane/6464022/bug6464022.java b/test/jdk/javax/swing/JOptionPane/6464022/bug6464022.java
index 8b3a8a07531..152bc7eecbf 100644
--- a/test/jdk/javax/swing/JOptionPane/6464022/bug6464022.java
+++ b/test/jdk/javax/swing/JOptionPane/6464022/bug6464022.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @author Pavel Porvatov
  * @library ../../regtesthelpers
  * @build Util
- * @run main/othervm -mx128m bug6464022
+ * @run main/othervm -Xmx128m bug6464022
  */
 
 import javax.swing.*;
diff --git a/test/jdk/javax/swing/UIDefaults/6795356/bug6795356.java b/test/jdk/javax/swing/UIDefaults/6795356/bug6795356.java
index 7be773a2c63..7ff527cc19d 100644
--- a/test/jdk/javax/swing/UIDefaults/6795356/bug6795356.java
+++ b/test/jdk/javax/swing/UIDefaults/6795356/bug6795356.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @author Alexander Potochkin
  * @library ../../regtesthelpers
  * @build Util
- * @run main/othervm -mx128m bug6795356
+ * @run main/othervm -Xmx128m bug6795356
  */
 
 import java.lang.ref.WeakReference;
diff --git a/test/jdk/javax/swing/border/TestTitledBorderLeak.java b/test/jdk/javax/swing/border/TestTitledBorderLeak.java
index 259a2f60c29..ea7c1e2a2fd 100644
--- a/test/jdk/javax/swing/border/TestTitledBorderLeak.java
+++ b/test/jdk/javax/swing/border/TestTitledBorderLeak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import javax.swing.border.TitledBorder;
  * @summary Verifies TitledBorder's memory leak
  * @library /javax/swing/regtesthelpers
  * @build Util
- * @run main/timeout=60/othervm -mx32m TestTitledBorderLeak
+ * @run main/timeout=60/othervm -Xmx32m TestTitledBorderLeak
  */
 public final class TestTitledBorderLeak {
 
diff --git a/test/jdk/javax/swing/regtesthelpers/Util.java b/test/jdk/javax/swing/regtesthelpers/Util.java
index 4724fa200d6..5f81384028e 100644
--- a/test/jdk/javax/swing/regtesthelpers/Util.java
+++ b/test/jdk/javax/swing/regtesthelpers/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ public class Util {
     /**
      * Fills the heap until OutOfMemoryError occurs. This method is useful for
      * WeakReferences removing. To minimize the amount of filled memory the
-     * test should provide reasonable heap size via -mx option.
+     * test should provide reasonable heap size via -Xmx option.
      */
     public static void generateOOME() {
         List<Object> bigLeak = new LinkedList<Object>();
diff --git a/test/jdk/sun/java2d/Disposer/TestDisposerLeak.java b/test/jdk/sun/java2d/Disposer/TestDisposerLeak.java
index 0fcf8cdda08..bdab5ffb5fb 100644
--- a/test/jdk/sun/java2d/Disposer/TestDisposerLeak.java
+++ b/test/jdk/sun/java2d/Disposer/TestDisposerLeak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ import sun.java2d.DisposerRecord;
  * @test
  * @bug 8129457
  * @summary Check Disposer disposes all objects without any memory leaks
- * @run main/othervm -mx128m TestDisposerLeak
+ * @run main/othervm -Xmx128m TestDisposerLeak
  * @modules java.desktop/sun.java2d
  */
 public final class TestDisposerLeak {
diff --git a/test/jdk/sun/java2d/Disposer/TestDisposerRace.java b/test/jdk/sun/java2d/Disposer/TestDisposerRace.java
index b78966f1200..cbb594d7a1f 100644
--- a/test/jdk/sun/java2d/Disposer/TestDisposerRace.java
+++ b/test/jdk/sun/java2d/Disposer/TestDisposerRace.java
@@ -33,7 +33,7 @@ import sun.java2d.DisposerRecord;
  * @test
  * @bug 8289208
  * @summary Verifies Disposer robustness in a multi-threaded environment.
- * @run main/othervm -mx128m TestDisposerRace
+ * @run main/othervm -Xmx128m TestDisposerRace
  * @modules java.desktop/sun.java2d
  */
 public final class TestDisposerRace {
diff --git a/test/jdk/sun/java2d/marlin/CrashTest.java b/test/jdk/sun/java2d/marlin/CrashTest.java
index b5283fdf332..5b9632caafe 100644
--- a/test/jdk/sun/java2d/marlin/CrashTest.java
+++ b/test/jdk/sun/java2d/marlin/CrashTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,9 @@ import javax.imageio.ImageIO;
 /**
  * @test
  * @summary Simple crash rendering test using huge GeneralPaths with the Marlin renderer
- * @run main/othervm -mx512m CrashTest
+ * @run main/othervm -Xmx512m CrashTest
  * @ignore tests that take a long time and consumes 5Gb memory
- * @run main/othervm -ms4g -mx4g CrashTest -slow
+ * @run main/othervm -Xms4g -Xmx4g CrashTest -slow
 */
 public class CrashTest {