diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 2f39f3fdcef..ce127ca579b 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -579,7 +579,9 @@ jdk_nio_networkchannel = \
 
 jdk_core_manual = \
     :jdk_core_manual_no_input \
-    :jdk_core_manual_no_input_security
+    :jdk_security_manual_no_input \
+    :jdk_core_manual_interactive \
+    :jdk_security_manual_interactive
 
 jdk_core_manual_no_input = \
     java/net/HugeDataTransferTest.java \
@@ -598,7 +600,7 @@ jdk_core_manual_no_input = \
     com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java \
     javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java
 
-jdk_core_manual_no_input_security = \
+jdk_security_manual_no_input = \
     com/sun/crypto/provider/Cipher/DES/PerformanceTest.java \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementDirect4.java \
@@ -625,14 +627,15 @@ jdk_core_manual_no_input_security = \
 jdk_core_manual_interactive = \
     com/sun/jndi/dns/Test6991580.java \
     java/util/TimeZone/DefaultTimeZoneTest.java \
-    sun/security/tools/keytool/i18n.java \
     java/nio/MappedByteBuffer/PmemTest.java \
     java/rmi/registry/nonLocalRegistry/NonLocalRegistryTest.java \
-    java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java \
+    java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java
+
+jdk_security_manual_interactive = \
+    sun/security/tools/keytool/i18n.java \
     java/security/Policy/Root/Root.java \
     sun/security/krb5/config/native/TestDynamicStore.java
 
-
 # Test sets for running inside container environment
 jdk_containers_extended = \
     :jdk_io \