diff --git a/src/share/lib/security/java.security-linux b/src/share/lib/security/java.security-linux
index 8fc53d736774a26cc29180227f1e173aa5603d16..6c62e385159bf1635864d8ea0a63dc70bed6e228 100644
--- a/src/share/lib/security/java.security-linux
+++ b/src/share/lib/security/java.security-linux
@@ -155,8 +155,7 @@ package.access=sun.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.,\
+               com.sun.org.glassfish.,\
 	       jdk.internal.
 
 #
@@ -179,8 +178,7 @@ package.definition=sun.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.,\
+                   com.sun.org.glassfish.,\
 		   jdk.internal.
 
 #
diff --git a/src/share/lib/security/java.security-macosx b/src/share/lib/security/java.security-macosx
index 5a319fa5445032b5a9470fa27ae9604d4dfa7cc8..56188dc3f827ddb4ae5478cc6e8a33540bf91e85 100644
--- a/src/share/lib/security/java.security-macosx
+++ b/src/share/lib/security/java.security-macosx
@@ -156,8 +156,7 @@ package.access=sun.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.,\
+               com.sun.org.glassfish.,\
 	       jdk.internal.,\
                apple.
 
@@ -181,8 +180,7 @@ package.definition=sun.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.,\
+                   com.sun.org.glassfish.,\
 		   jdk.internal.,\
                    apple.
 
diff --git a/src/share/lib/security/java.security-solaris b/src/share/lib/security/java.security-solaris
index 2a781cff75d667758247e5660e3924625d1730bf..bf56b71cdb8ef925fdedb291990c56b2d3bf29da 100644
--- a/src/share/lib/security/java.security-solaris
+++ b/src/share/lib/security/java.security-solaris
@@ -157,8 +157,7 @@ package.access=sun.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.,\
+               com.sun.org.glassfish.,\
 	       jdk.internal.
 
 #
@@ -181,8 +180,7 @@ package.definition=sun.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.,\
+                   com.sun.org.glassfish.,\
 		   jdk.internal.
 
 #
diff --git a/src/share/lib/security/java.security-windows b/src/share/lib/security/java.security-windows
index a00f4628dd68fc6801cfbe3e7f8e039906f699aa..479788f2c9d6aebfb6f4ae146bdcc9c3791dfcba 100644
--- a/src/share/lib/security/java.security-windows
+++ b/src/share/lib/security/java.security-windows
@@ -156,8 +156,7 @@ package.access=sun.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.,\
+               com.sun.org.glassfish.,\
 	       jdk.internal.
 
 #
@@ -180,8 +179,7 @@ package.definition=sun.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.,\
+                   com.sun.org.glassfish.,\
 		   jdk.internal.
 
 #
diff --git a/test/Makefile b/test/Makefile
index 69d5dac3d579e5544c184d486218db100f95aae1..75e56458a14ea81516918adfe573c5a51e914259 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -514,7 +514,7 @@ jdk_other: $(call TestDirs, \
 	  java/sql javax/sql \
           javax/smartcardio \
 	  javax/xml/soap \
-	  javax/xml/ws com/sun/internal/ws \
+	  javax/xml/ws com/sun/internal/ws com/sun/org/glassfish \
 	  jdk/asm \
 	  com/sun/org/apache/xerces \
           com/sun/corba \