diff --git a/crypto/crypto.gradle b/crypto/crypto.gradle
index cabe085556..6b096821a7 100644
--- a/crypto/crypto.gradle
+++ b/crypto/crypto.gradle
@@ -1,13 +1,12 @@
 // crypto module build file
 
-jdkVersion = System.properties['java.version']
-javaClassVersion = System.properties['java.class.version']
-println "JDK Version is $jdkVersion, class version is $javaClassVersion"
-
-isJdk6 = jdkVersion.startsWith('1.6')
+// jdkVersion = System.properties['java.version']
+// isJdk6 = jdkVersion >= '1.6'
+int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')
 
 test {
-    if (!isJdk6) {
+    if (maxAESKeySize < 256) {
+        println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests"
         exclude '**/EncryptorsTests.class'
     }
 }