diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
index 02524e676561c..bcefae7241f4e 100644
--- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
@@ -878,9 +878,8 @@ static final class SupportedGroups {
                 // FFDHE (RFC 7919)
                 FFDHE_2048,
                 FFDHE_3072,
-                FFDHE_4096,
-                FFDHE_6144,
-                FFDHE_8192
+                FFDHE_4096
+                // FFDHE_6144 and FFDHE_8192 were removed in JDK-8373426
         };
 
         // Filter default groups names against default constraints.
diff --git a/test/jdk/sun/security/ssl/CipherSuite/DefaultNamedGroups.java b/test/jdk/sun/security/ssl/CipherSuite/DefaultNamedGroups.java
index 44c9d566dc0d7..cf86be5572ab0 100644
--- a/test/jdk/sun/security/ssl/CipherSuite/DefaultNamedGroups.java
+++ b/test/jdk/sun/security/ssl/CipherSuite/DefaultNamedGroups.java
@@ -52,9 +52,7 @@ public class DefaultNamedGroups extends SSLEngineTemplate {
                     "x448",
                     "ffdhe2048",
                     "ffdhe3072",
-                    "ffdhe4096",
-                    "ffdhe6144",
-                    "ffdhe8192")
+                    "ffdhe4096")
             .sorted()
             .toList();
 
diff --git a/test/jdk/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java b/test/jdk/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java
index 209db9d7461f4..0f002a1e29be1 100644
--- a/test/jdk/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java
+++ b/test/jdk/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, 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
@@ -47,10 +47,8 @@
  * @run main/othervm -Djdk.tls.namedGroups=ffdhe4096 UseStrongDHSizes 4096
  * @run main/othervm -Djdk.tls.namedGroups=ffdhe6144 UseStrongDHSizes 4096
  * @run main/othervm -Djdk.tls.namedGroups=ffdhe8192 UseStrongDHSizes 4096
- * @run main/othervm UseStrongDHSizes 6144
  * @run main/othervm -Djdk.tls.namedGroups=ffdhe6144 UseStrongDHSizes 6144
  * @run main/othervm -Djdk.tls.namedGroups=ffdhe8192 UseStrongDHSizes 6144
- * @run main/othervm UseStrongDHSizes 8192
  * @run main/othervm -Djdk.tls.namedGroups=ffdhe8192 UseStrongDHSizes 8192
  */