diff --git a/crypto/crypto.gradle b/crypto/crypto.gradle
index d690707990..cabe085556 100644
--- a/crypto/crypto.gradle
+++ b/crypto/crypto.gradle
@@ -1,7 +1,10 @@
 // crypto module build file
 
 jdkVersion = System.properties['java.version']
-isJdk6 = jdkVersion >= '1.6'
+javaClassVersion = System.properties['java.class.version']
+println "JDK Version is $jdkVersion, class version is $javaClassVersion"
+
+isJdk6 = jdkVersion.startsWith('1.6')
 
 test {
     if (!isJdk6) {