diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index fd8f155af42..37e3abf2ba1 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -2591,9 +2591,6 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
     // -Xdebug
     } else if (match_option(option, "-Xdebug")) {
       warning("Option -Xdebug was deprecated in JDK 22 and will likely be removed in a future release.");
-    // -Xnoagent
-    } else if (match_option(option, "-Xnoagent")) {
-      warning("Option -Xnoagent was deprecated in JDK 22 and will likely be removed in a future release.");
     } else if (match_option(option, "-Xloggc:", &tail)) {
       // Deprecated flag to redirect GC output to a file. -Xloggc:<filename>
       log_warning(gc)("-Xloggc is deprecated. Will use -Xlog:gc:%s instead.", tail);
diff --git a/test/hotspot/jtreg/runtime/CommandLine/TestNullTerminatedFlags.java b/test/hotspot/jtreg/runtime/CommandLine/TestNullTerminatedFlags.java
index e31a7e2cd17..6f7cc688068 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/TestNullTerminatedFlags.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/TestNullTerminatedFlags.java
@@ -50,8 +50,7 @@ public class TestNullTerminatedFlags {
             "-Xshare:on",
             "-Xshare:auto",
             "-Xshare:off",
-            "-Xdebug",
-            "-Xnoagent"
+            "-Xdebug"
         };
 
     public static void main(String args[]) throws Exception{