diff a/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.out b/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.out
--- a/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.out
+++ b/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.out
@@ -1,123 +1,123 @@
 
 CLASSFILE  T.iC
---- SUPER
+---
 INNERCLASS  iC
 ---
 
 CLASSFILE  T.iSC
---- SUPER
+---
 INNERCLASS  iSC
 --- STATIC
 
 CLASSFILE  T.iVC
---- SUPER
+---
 INNERCLASS  iVC
 --- PRIVATE
 
 CLASSFILE  T.iSVC
---- SUPER
+---
 INNERCLASS  iSVC
 --- PRIVATE STATIC
 
 CLASSFILE  T.iFC
---- FINAL SUPER
+--- FINAL
 INNERCLASS  iFC
 --- FINAL
 
 CLASSFILE  T.iSFC
---- FINAL SUPER
+--- FINAL
 INNERCLASS  iSFC
 --- STATIC FINAL
 
 CLASSFILE  T.iFVC
---- FINAL SUPER
+--- FINAL
 INNERCLASS  iFVC
 --- PRIVATE FINAL
 
 CLASSFILE  T.iSFVC
---- FINAL SUPER
+--- FINAL
 INNERCLASS  iSFVC
 --- PRIVATE STATIC FINAL
 
 CLASSFILE  T.iAC
---- SUPER ABSTRACT
+--- ABSTRACT
 INNERCLASS  iAC
 --- ABSTRACT
 
 CLASSFILE  T.iSAC
---- SUPER ABSTRACT
+--- ABSTRACT
 INNERCLASS  iSAC
 --- STATIC ABSTRACT
 
 CLASSFILE  T.iAVC
---- SUPER ABSTRACT
+--- ABSTRACT
 INNERCLASS  iAVC
 --- PRIVATE ABSTRACT
 
 CLASSFILE  T.iSAVC
---- SUPER ABSTRACT
+--- ABSTRACT
 INNERCLASS  iSAVC
 --- PRIVATE STATIC ABSTRACT
 
 CLASSFILE  T.iRC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  iRC
 --- PROTECTED
 
 CLASSFILE  T.iSRC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  iSRC
 --- PROTECTED STATIC
 
 CLASSFILE  T.iUC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  iUC
 --- PUBLIC
 
 CLASSFILE  T.iSUC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  iSUC
 --- PUBLIC STATIC
 
 CLASSFILE  T.iFRC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  iFRC
 --- PROTECTED FINAL
 
 CLASSFILE  T.iSFRC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  iSFRC
 --- PROTECTED STATIC FINAL
 
 CLASSFILE  T.iFUC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  iFUC
 --- PUBLIC FINAL
 
 CLASSFILE  T.iSFUC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  iSFUC
 --- PUBLIC STATIC FINAL
 
 CLASSFILE  T.iARC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  iARC
 --- PROTECTED ABSTRACT
 
 CLASSFILE  T.iSARC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  iSARC
 --- PROTECTED STATIC ABSTRACT
 
 CLASSFILE  T.iAUC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  iAUC
 --- PUBLIC ABSTRACT
 
 CLASSFILE  T.iSAUC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  iSAUC
 --- PUBLIC STATIC ABSTRACT
 
 CLASSFILE  T.iI
 --- INTERFACE ABSTRACT
@@ -198,11 +198,11 @@
 --- PUBLIC INTERFACE ABSTRACT
 INNERCLASS  iSAUI
 --- PUBLIC STATIC INTERFACE ABSTRACT
 
 CLASSFILE  T
---- SUPER
+---
 INNERCLASS  iSAUI
 --- PUBLIC STATIC INTERFACE ABSTRACT
 INNERCLASS  iAUI
 --- PUBLIC STATIC INTERFACE ABSTRACT
 INNERCLASS  iSUI
@@ -281,66 +281,66 @@
 --- STATIC
 INNERCLASS  iC
 ---
 
 CLASSFILE  U.jC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  jC
 --- PUBLIC STATIC
 
 CLASSFILE  U.jSC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  jSC
 --- PUBLIC STATIC
 
 CLASSFILE  U.jUC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  jUC
 --- PUBLIC STATIC
 
 CLASSFILE  U.jSUC
---- PUBLIC SUPER
+--- PUBLIC
 INNERCLASS  jSUC
 --- PUBLIC STATIC
 
 CLASSFILE  U.jFC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  jFC
 --- PUBLIC STATIC FINAL
 
 CLASSFILE  U.jSFC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  jSFC
 --- PUBLIC STATIC FINAL
 
 CLASSFILE  U.jFUC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  jFUC
 --- PUBLIC STATIC FINAL
 
 CLASSFILE  U.jSFUC
---- PUBLIC FINAL SUPER
+--- PUBLIC FINAL
 INNERCLASS  jSFUC
 --- PUBLIC STATIC FINAL
 
 CLASSFILE  U.jAC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  jAC
 --- PUBLIC STATIC ABSTRACT
 
 CLASSFILE  U.jSAC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  jSAC
 --- PUBLIC STATIC ABSTRACT
 
 CLASSFILE  U.jAUC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  jAUC
 --- PUBLIC STATIC ABSTRACT
 
 CLASSFILE  U.jSAUC
---- PUBLIC SUPER ABSTRACT
+--- PUBLIC ABSTRACT
 INNERCLASS  jSAUC
 --- PUBLIC STATIC ABSTRACT
 
 CLASSFILE  U.jI
 --- PUBLIC INTERFACE ABSTRACT
