--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Tue May 12 01:24:03 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Thu May 21 14:12:22 2015 +0100
@@ -57,6 +57,7 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
+        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of PPExpressionGrammar"
         #'stx:goodies/petitparser/parsers/java'    "PPJavaLexiconTest - superclass of PPCompiledJavaSyntaxTest"
         #'stx:goodies/petitparser/tests'    "PPAbstractParserTest - superclass of PPCCompiledJavaVerificationTest"
         #'stx:goodies/sunit'    "TestAsserter - superclass of PPCCompiledJavaVerificationTest"
@@ -75,9 +76,7 @@
      by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPFailure - referenced by PPCResources>>workingJavaInDirectory:"
         #'stx:goodies/petitparser/compiler'    "PPCArguments - referenced by PPCSmalltalkTests>>setUp"
-        #'stx:goodies/petitparser/compiler/tests'    "PPCompiledExpressionGrammarResource - referenced by PPCompiledExpressionsVerificationTest class>>resources"
         #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - referenced by PPCSmalltalkVerificationTest>>smalltalkGrammar"
         #'stx:libbasic2'    "Random - referenced by PPCResources>>expressionOfSize:stream:"
     )
@@ -108,10 +107,20 @@
         (PPCResources autoload)
         (PPCSmalltalkTests autoload)
         (PPCSmalltalkVerificationTest autoload)
+        (PPCompiledExpressionGrammarResource autoload)
+        (PPCompiledExpressionGrammarTest autoload)
         (PPCompiledJavaResource autoload)
         (PPCompiledJavaSyntaxTest autoload)
         (PPCompiledSmalltalkGrammarResource autoload)
         (PPCompiledSmalltalkGrammarTests autoload)
+        PPExpressionGrammar
+        (PPExpressionGrammarTest autoload)
+        PPLL1ExpressionGrammar
+        (PPLL1ExpressionGrammarTest autoload)
+        (PPTokenizedExpressionGrammarResource autoload)
+        (PPTokenizedExpressionGrammarTest autoload)
+        (PPTokenizedLL1ExpressionGrammarResource autoload)
+        (PPTokenizedLL1ExpressionGrammarTest autoload)
         (PPTokenizedSmalltalkGrammarResource autoload)
         (PPTokenizedSmalltalkGrammarTests autoload)
         #'stx_goodies_petitparser_compiler_tests_extras'