diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
index d498c6f8c..21808110e 100755
--- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
+++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
@@ -163,10 +163,14 @@ else if ( runtimeSource <= 11 )
         {
             javaSource = "6";
         }
-        else 
+        else if ( runtimeSource <= 17 )
         {
             javaSource = "7";
         }
+        else
+        {
+            javaSource = "8";
+        }
         
         compileGeneratedSources( verifierId, javaSource );
     }
@@ -190,9 +194,13 @@ else if ( runtimeSource <= 11 )
         {
             javaSource = Integer.toString( Math.max( minJavaSource, 6) );
         }
-        else 
+        else if ( runtimeSource <= 17 )
+        {
+            javaSource = Integer.toString( Math.max( minJavaSource, 7) );
+        }
+        else
         {
-            javaSource = Integer.toString( Math.max( minJavaSource, 7) );;
+            javaSource = Integer.toString( Math.max( minJavaSource, 8) );;
         }
         
         compileGeneratedSources( verifierId, javaSource );