--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Fri Jul 31 08:22:18 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Thu Jul 30 08:37:37 2015 +0100
@@ -85,8 +85,9 @@
     ^ #(
         #'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"
+        #'stx:goodies/petitparser/parsers/smalltalk/tests'    "PPSmalltalkGrammarTests - superclass of PPCSmalltalkGrammarTests"
+        #'stx:goodies/petitparser/tests'    "PPAbstractParserTest - superclass of PPCAbstractParserTest"
+        #'stx:goodies/sunit'    "TestAsserter - extended"
         #'stx:libbasic'    "LibraryDefinition - superclass of stx_goodies_petitparser_compiler_tests_extras"
     )
 !
@@ -103,7 +104,7 @@
 
     ^ #(
         #'stx:goodies/petitparser/compiler'    "PPCArguments - referenced by PPCSmalltalkTests>>setUp"
-        #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - referenced by PPCSmalltalkVerificationTest>>smalltalkGrammar"
+        #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - referenced by PPCSmalltalkGrammarTests>>petitParserClass"
         #'stx:libbasic2'    "Random - referenced by PPCResources>>expressionOfSize:stream:"
     )
 !
@@ -128,37 +129,40 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
-        PPCCompiledJavaVerificationTest
-        PPCExpressionsVerificationTest
-        PPCResources
-        PPCSmalltalkTests
-        PPCSmalltalkVerificationTest
-        PPCompiledExpressionGrammarResource
-        PPCompiledExpressionGrammarTest
-        PPCompiledJavaResource
+        (PPCAbstractParserTest autoload)
+        (PPCCompiledJavaVerificationTest autoload)
+        (PPCCompositeParserTest autoload)
+        (PPCResources autoload)
+        (PPCSetUpBeforeTearDownAfterResource autoload)
+        (PPCSmalltalkGrammarTests autoload)
+        (PPCSmalltalkParserTests autoload)
+        (PPCSmalltalkTests autoload)
+        (PPCompiledJavaResource autoload)
         (PPCompiledJavaSyntaxTest autoload)
-        PPCompiledSmalltalkGrammarResource
-        PPCompiledSmalltalkGrammarTests
-        (PPCompiledSmalltalkParserResource autoload)
-        (PPCompiledSmalltalkParserTests autoload)
-        PPExpressionGrammar
-        PPExpressionGrammarTest
-        PPLL1ExpressionGrammar
-        PPLL1ExpressionGrammarTest
-        PPTokenizedExpressionGrammarResource
-        PPTokenizedExpressionGrammarTest
-        PPTokenizedLL1ExpressionGrammarResource
-        PPTokenizedLL1ExpressionGrammarTest
-        PPTokenizedSmalltalkGrammarResource
-        PPTokenizedSmalltalkGrammarTests
-        (PPTokenizedSmalltalkParserResource autoload)
-        (PPTokenizedSmalltalkParserTests autoload)
-        #'stx_goodies_petitparser_compiler_tests_extras'
-        PPCompiledExpressionsVerificationTest
-        PPCompiledSmalltalkVerificationTest
-        PPTokenizedExpressionsVerificationTest
-        (PPTokenizedSmalltalkParserVerificationTest autoload)
-        PPTokenizedSmalltalkVerificationTest
+        (PPExpressionGrammar autoload)
+        (PPExpressionGrammarTest autoload)
+        (PPLL1ExpressionGrammar autoload)
+        (PPLL1ExpressionGrammarTest autoload)
+        (#'stx_goodies_petitparser_compiler_tests_extras' autoload)
+        (PPCExpressionGrammarTest autoload)
+        (PPCExpressionGrammarVerificationTest autoload)
+        (PPCLL1ExpressionGrammarTest autoload)
+        (#'PPCSmalltalkGrammarTests_Tokenized' autoload)
+        (#'PPCSmalltalkGrammarTests_Universal' autoload)
+        (PPCSmalltalkGrammarVerificationTest autoload)
+        (#'PPCSmalltalkParserTests_Tokenized' autoload)
+        (#'PPCSmalltalkParserTests_Universal' autoload)
+        (PPCSmalltalkParserVerificationTest autoload)
+        (#'PPCExpressionGrammarTest_Tokenized' autoload)
+        (#'PPCExpressionGrammarTest_Universal' autoload)
+        (#'PPCLL1ExpressionGrammarTest_Tokenized' autoload)
+        (#'PPCLL1ExpressionGrammarTest_Universal' autoload)
+        (#'PPCSmalltalkGrammarVerificationTest_Tokenized' autoload)
+        (#'PPCSmalltalkGrammarVerificationTest_Universal' autoload)
+        (#'PPCSmalltalkParserVerificationTest_Tokenized' autoload)
+        (#'PPCSmalltalkParserVerificationTest_Universal' autoload)
+        (#'PPExpressionGrammarVerificationTest_Tokenized' autoload)
+        (#'PPExpressionGrammarVerificationTest_Universal' autoload)
     )
 !
 
@@ -167,6 +171,7 @@
      A correponding method with real names must be present in my concrete subclasses"
 
     ^ #(
+        'TestResource class' availableFor:
     )
 ! !