diff --git a/test/jdk/javax/management/MBeanServer/ExceptionFactory.java b/test/jdk/javax/management/MBeanServer/ExceptionFactory.java
index 2315edff3fc..a615c5252da 100644
--- a/test/jdk/javax/management/MBeanServer/ExceptionFactory.java
+++ b/test/jdk/javax/management/MBeanServer/ExceptionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, 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
@@ -67,12 +67,8 @@ import javax.management.remote.JMXProviderException;
 import javax.management.remote.JMXServerErrorException;
 
 /**
- *  |----- Original Description Coming From Tonga Original Source Code -------|
- *  |                                                                         |
- *  | That class creates an ArrayList and fill it with an instance of each of |
- *  | the Exception class of the JMX API.                                     |
- *  | It's dedicated to use by ExceptionTest.                                 |
- *  |-------------------------------------------------------------------------|
+ * This class creates an ArrayList and fills it with an instance of each
+ * Exception class in the JMX API.  Used by ExceptionTest.
  */
 public class ExceptionFactory {
 
diff --git a/test/jdk/javax/management/MBeanServer/ExceptionTest.java b/test/jdk/javax/management/MBeanServer/ExceptionTest.java
index bb58e941242..d3550780f0b 100644
--- a/test/jdk/javax/management/MBeanServer/ExceptionTest.java
+++ b/test/jdk/javax/management/MBeanServer/ExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, 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
@@ -188,7 +188,6 @@ public class ExceptionTest {
         return true;
     }
 
-    // Utility inner class coming from JMX Tonga test suite.
     // Also used by ExceptionFactory.
     static class Utils {
 
@@ -222,9 +221,6 @@ public class ExceptionTest {
         }
 
         /**
-         * Reproduces the original parsing and collection of test parameters
-         * from the DTonga JMX test suite.
-         *
          * Collects passed args and returns them in a map(argname, value) structure,
          * which will be then propagated as necessary to various called methods.
          */
diff --git a/test/jdk/javax/management/mxbean/Utils.java b/test/jdk/javax/management/mxbean/Utils.java
index f77196baa2c..550f11736a1 100644
--- a/test/jdk/javax/management/mxbean/Utils.java
+++ b/test/jdk/javax/management/mxbean/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, 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
@@ -27,7 +27,6 @@ import java.util.Properties;
 import java.lang.reflect.Method;
 import javax.management.remote.JMXConnectorServerMBean;
 
-// utility class for MXBean* tests coming from JMX Tonga test suite
 class Utils {
 
     // DEBUG is printed depending on the DEBUG and DEBUG_LEVEL JAVA property
@@ -60,9 +59,6 @@ class Utils {
     }
 
     /**
-     * Reproduces the original parsing and collection of test parameters
-     * from the DTonga JMX test suite.
-     *
      * Collects passed args and returns them in a map(argname, value) structure,
      * which will be then propagated as necessary to various called methods.
      */
diff --git a/test/jdk/javax/management/query/SupportedQueryTypesTest.java b/test/jdk/javax/management/query/SupportedQueryTypesTest.java
index 8c254329915..17c720d499e 100644
--- a/test/jdk/javax/management/query/SupportedQueryTypesTest.java
+++ b/test/jdk/javax/management/query/SupportedQueryTypesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, 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
@@ -287,7 +287,6 @@ public class SupportedQueryTypesTest {
         }
     }
 
-    // Utility inner class coming from JMX Tonga test suite.
     private static class Utils {
 
         // DEBUG is printed depending on the DEBUG and DEBUG_LEVEL JAVA property
@@ -320,9 +319,6 @@ public class SupportedQueryTypesTest {
         }
 
         /**
-         * Reproduces the original parsing and collection of test parameters
-         * from the DTonga JMX test suite.
-         *
          * Collects passed args and returns them in a map(argname, value) structure,
          * which will be then propagated as necessary to various called methods.
          */
diff --git a/test/jdk/javax/management/security/Utils.java b/test/jdk/javax/management/security/Utils.java
index c0af037a4d6..afb1a8b1842 100644
--- a/test/jdk/javax/management/security/Utils.java
+++ b/test/jdk/javax/management/security/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, 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,6 @@ import java.util.StringTokenizer;
 import java.lang.reflect.Method;
 import javax.management.remote.JMXConnectorServerMBean;
 
-// utility class for MXBean* tests coming from JMX Tonga test suite
 class Utils {
 
     private static final String SERVER_SIDE_NAME = "-server";
@@ -64,9 +63,6 @@ class Utils {
     }
 
     /**
-     * Reproduces the original parsing and collection of test parameters
-     * from the DTonga JMX test suite.
-     *
      * Collects passed args and returns them in a map(argname, value) structure,
      * which will be then propagated as necessary to various called methods.
      */