diff --git a/src/share/native/java/lang/System.c b/src/share/native/java/lang/System.c
index 2adc82f44b595c9a926382a652abebdcc5d74f13..e04dfca8b3938e0a264bf073d271aaa2008282e7 100644
--- a/src/share/native/java/lang/System.c
+++ b/src/share/native/java/lang/System.c
@@ -84,7 +84,7 @@ Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x)
 #define VENDOR_URL_BUG "http://java.sun.com/cgi-bin/bugreport.cgi"
 #endif
 
-#define JAVA_MAX_SUPPORTED_VERSION 50
+#define JAVA_MAX_SUPPORTED_VERSION 51
 #define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
 
 JNIEXPORT jobject JNICALL
diff --git a/test/java/lang/System/Versions.java b/test/java/lang/System/Versions.java
index d94d3b451ebbd74d03fb6976ca0405065c7f52eb..158b5b490c12b753a5af54db6d46e30f2d971c79 100644
--- a/test/java/lang/System/Versions.java
+++ b/test/java/lang/System/Versions.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 4989690 6259855
+ * @bug 4989690 6259855 6706299
  * @summary Check that version-related system property invariants hold.
  * @author Martin Buchholz
  */