diff -r b5316ef15274 -r f6f68d32de73 compiler/tests/PEGFsaScannerIntegrationTest.st
--- a/compiler/tests/PEGFsaScannerIntegrationTest.st	Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/PEGFsaScannerIntegrationTest.st	Mon Aug 24 15:34:14 2015 +0100
@@ -617,7 +617,7 @@
 
     scanner initialize.
     scanner stream: stream asPetitStream. 
-    scanner nextToken.
+    scanner scan_nextToken.
     
     result := scanner polyResult.
     
@@ -630,7 +630,7 @@
 
     scanner initialize.
     scanner stream: stream asPetitStream. 
-    scanner nextToken.
+    scanner scan_nextToken.
     
     result := scanner polyResult.
     
@@ -639,10 +639,14 @@
 !
 
 generate
+    | codeGenerator |
     fsa name: #nextToken.
     
-    scanner := ((PPCScannerCodeGenerator new)
-        generateAndCompile: fsa).
+    codeGenerator := PPCScannerCodeGenerator new.
+    codeGenerator arguments scannerSuperclass: PPCScanner.
+    
+    scanner := codeGenerator
+        generateAndCompile: fsa.
 
     compiled := true
 !
@@ -673,7 +677,7 @@
     self compile.
 
     scanner stream: stream asPetitStream. 
-    scanner nextToken.
+    scanner scan_nextToken.
 
     result := scanner polyResult.