diff --git a/lib/java/gradle/functionalTests.gradle b/lib/java/gradle/functionalTests.gradle
index 0c27078..b3f5d8b 100644
--- a/lib/java/gradle/functionalTests.gradle
+++ b/lib/java/gradle/functionalTests.gradle
@@ -96,7 +96,8 @@
 // The common Uber jar path
 def jarPath = shadowJar.archiveFile.get().asFile.canonicalPath
 def trustStore = file("${projectDir}/src/crossTest/resources/.truststore").canonicalPath
-def keyStore = file("${projectDir}/src/crossTest/resources/.keystore").canonicalPath
+def serverKeyStore = file("${projectDir}/src/crossTest/resources/.serverkeystore").canonicalPath
+def clientKeyStore = file("${projectDir}/src/crossTest/resources/.clientkeystore").canonicalPath
 
 task generateRunnerScriptForClient(group: 'Build') {
     description = 'Generate a runner script for cross-check tests with TestClient'
@@ -106,7 +107,7 @@
     def runClientText = """\
 ${scriptHead}
 
-"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.trustStore=$trustStore" -Djavax.net.ssl.trustStorePassword=thrift org.apache.thrift.test.TestClient $args
+"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$clientKeyStore" -Djavax.net.ssl.keyStorePassword=thrift "-Djavax.net.ssl.trustStore=$trustStore" -Djavax.net.ssl.trustStorePassword=thrift org.apache.thrift.test.TestClient $args
 """
     inputs.property 'runClientText', runClientText
     outputs.file clientFile
@@ -126,7 +127,7 @@
     def runServerText = """\
 ${scriptHead}
 
-"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$keyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestServer $args
+"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$serverKeyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestServer $args
 """
 
     inputs.property 'runServerText', runServerText
@@ -147,7 +148,7 @@
     def runServerText = """\
 ${scriptHead}
 
-"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$keyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestNonblockingServer $args
+"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$serverKeyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestNonblockingServer $args
 """
 
     inputs.property 'runServerText', runServerText
@@ -168,7 +169,7 @@
     def runServerText = """\
 ${scriptHead}
 
-"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$keyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestTServletServer $args
+"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$serverKeyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestTServletServer $args
 """
 
     inputs.property 'runServerText', runServerText
diff --git a/lib/java/gradle/unitTests.gradle b/lib/java/gradle/unitTests.gradle
index 6f63956..24affad 100644
--- a/lib/java/gradle/unitTests.gradle
+++ b/lib/java/gradle/unitTests.gradle
@@ -82,7 +82,7 @@
         'test.port': "${testPort}",
         'javax.net.ssl.trustStore': "${projectDir}/src/crossTest/resources/.truststore",
         'javax.net.ssl.trustStorePassword': 'thrift',
-        'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.keystore",
+        'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.serverkeystore",
         'javax.net.ssl.keyStorePassword': 'thrift'
     ]
 }
diff --git a/lib/java/src/crossTest/resources/.clientkeystore b/lib/java/src/crossTest/resources/.clientkeystore
new file mode 100644
index 0000000..63d869f
--- /dev/null
+++ b/lib/java/src/crossTest/resources/.clientkeystore
Binary files differ
diff --git a/lib/java/src/crossTest/resources/.keystore b/lib/java/src/crossTest/resources/.keystore
deleted file mode 100644
index 4dd66ac..0000000
--- a/lib/java/src/crossTest/resources/.keystore
+++ /dev/null
Binary files differ
diff --git a/lib/java/src/crossTest/resources/.serverkeystore b/lib/java/src/crossTest/resources/.serverkeystore
new file mode 100644
index 0000000..a9c5c83
--- /dev/null
+++ b/lib/java/src/crossTest/resources/.serverkeystore
Binary files differ
diff --git a/lib/java/src/crossTest/resources/.truststore b/lib/java/src/crossTest/resources/.truststore
index 26fbd19..79ffe3e 100644
--- a/lib/java/src/crossTest/resources/.truststore
+++ b/lib/java/src/crossTest/resources/.truststore
Binary files differ
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index 882c57e..4ec6692 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -85,60 +85,24 @@
   "cpp-go_multih-header_http-ip-ssl",
   "cpp-go_multij-json_http-ip",
   "cpp-go_multij-json_http-ip-ssl",
-  "cpp-java_binary_buffered-ip-ssl",
-  "cpp-java_binary_framed-fastframed-ip-ssl",
-  "cpp-java_binary_framed-ip-ssl",
   "cpp-java_binary_http-ip",
   "cpp-java_binary_http-ip-ssl",
-  "cpp-java_binary_zlib-ip-ssl",
-  "cpp-java_compact_buffered-ip-ssl",
-  "cpp-java_compact_framed-fastframed-ip-ssl",
-  "cpp-java_compact_framed-ip-ssl",
   "cpp-java_compact_http-ip",
   "cpp-java_compact_http-ip-ssl",
-  "cpp-java_compact_zlib-ip-ssl",
-  "cpp-java_json_buffered-ip-ssl",
-  "cpp-java_json_framed-fastframed-ip-ssl",
-  "cpp-java_json_framed-ip-ssl",
   "cpp-java_json_http-ip",
   "cpp-java_json_http-ip-ssl",
-  "cpp-java_json_zlib-ip-ssl",
-  "cpp-java_multi-binary_buffered-ip-ssl",
-  "cpp-java_multi-binary_framed-fastframed-ip-ssl",
-  "cpp-java_multi-binary_framed-ip-ssl",
   "cpp-java_multi-binary_http-ip",
   "cpp-java_multi-binary_http-ip-ssl",
-  "cpp-java_multi-binary_zlib-ip-ssl",
-  "cpp-java_multi_buffered-ip-ssl",
-  "cpp-java_multi_framed-fastframed-ip-ssl",
-  "cpp-java_multi_framed-ip-ssl",
   "cpp-java_multi_http-ip",
   "cpp-java_multi_http-ip-ssl",
-  "cpp-java_multi_zlib-ip-ssl",
-  "cpp-java_multic-compact_buffered-ip-ssl",
-  "cpp-java_multic-compact_framed-fastframed-ip-ssl",
-  "cpp-java_multic-compact_framed-ip-ssl",
   "cpp-java_multic-compact_http-ip",
   "cpp-java_multic-compact_http-ip-ssl",
-  "cpp-java_multic-compact_zlib-ip-ssl",
-  "cpp-java_multic_buffered-ip-ssl",
-  "cpp-java_multic_framed-fastframed-ip-ssl",
-  "cpp-java_multic_framed-ip-ssl",
   "cpp-java_multic_http-ip",
   "cpp-java_multic_http-ip-ssl",
-  "cpp-java_multic_zlib-ip-ssl",
-  "cpp-java_multij-json_buffered-ip-ssl",
-  "cpp-java_multij-json_framed-fastframed-ip-ssl",
-  "cpp-java_multij-json_framed-ip-ssl",
   "cpp-java_multij-json_http-ip",
   "cpp-java_multij-json_http-ip-ssl",
-  "cpp-java_multij-json_zlib-ip-ssl",
-  "cpp-java_multij_buffered-ip-ssl",
-  "cpp-java_multij_framed-fastframed-ip-ssl",
-  "cpp-java_multij_framed-ip-ssl",
   "cpp-java_multij_http-ip",
   "cpp-java_multij_http-ip-ssl",
-  "cpp-java_multij_zlib-ip-ssl",
   "cpp-netstd_binary_buffered-ip",
   "cpp-netstd_binary_buffered-ip-ssl",
   "cpp-netstd_binary_framed-ip",
@@ -513,24 +477,12 @@
   "go-dart_binary_http-ip",
   "go-dart_compact_http-ip",
   "go-dart_json_http-ip",
-  "go-java_binary_buffered-ip-ssl",
-  "go-java_binary_framed-fastframed-ip-ssl",
-  "go-java_binary_framed-ip-ssl",
   "go-java_binary_http-ip",
   "go-java_binary_http-ip-ssl",
-  "go-java_binary_zlib-ip-ssl",
-  "go-java_compact_buffered-ip-ssl",
-  "go-java_compact_framed-fastframed-ip-ssl",
-  "go-java_compact_framed-ip-ssl",
   "go-java_compact_http-ip",
   "go-java_compact_http-ip-ssl",
-  "go-java_compact_zlib-ip-ssl",
-  "go-java_json_buffered-ip-ssl",
-  "go-java_json_framed-fastframed-ip-ssl",
-  "go-java_json_framed-ip-ssl",
   "go-java_json_http-ip",
   "go-java_json_http-ip-ssl",
-  "go-java_json_zlib-ip-ssl",
   "go-netstd_binary_buffered-ip",
   "go-netstd_binary_buffered-ip-ssl",
   "go-netstd_binary_framed-ip",
@@ -557,42 +509,6 @@
   "hs-php_binary-accel_framed-ip",
   "hs-php_json_buffered-ip",
   "hs-php_json_framed-ip",
-  "java-cpp_binary_buffered-ip-ssl",
-  "java-cpp_binary_fastframed-framed-ip-ssl",
-  "java-cpp_binary_framed-ip-ssl",
-  "java-cpp_binary_zlib-ip-ssl",
-  "java-cpp_compact_buffered-ip-ssl",
-  "java-cpp_compact_fastframed-framed-ip-ssl",
-  "java-cpp_compact_framed-ip-ssl",
-  "java-cpp_compact_zlib-ip-ssl",
-  "java-cpp_json_buffered-ip-ssl",
-  "java-cpp_json_fastframed-framed-ip-ssl",
-  "java-cpp_json_framed-ip-ssl",
-  "java-cpp_json_zlib-ip-ssl",
-  "java-cpp_multi-binary_buffered-ip-ssl",
-  "java-cpp_multi-binary_fastframed-framed-ip-ssl",
-  "java-cpp_multi-binary_framed-ip-ssl",
-  "java-cpp_multi-binary_zlib-ip-ssl",
-  "java-cpp_multi_buffered-ip-ssl",
-  "java-cpp_multi_fastframed-framed-ip-ssl",
-  "java-cpp_multi_framed-ip-ssl",
-  "java-cpp_multi_zlib-ip-ssl",
-  "java-cpp_multic-compact_buffered-ip-ssl",
-  "java-cpp_multic-compact_fastframed-framed-ip-ssl",
-  "java-cpp_multic-compact_framed-ip-ssl",
-  "java-cpp_multic-compact_zlib-ip-ssl",
-  "java-cpp_multic_buffered-ip-ssl",
-  "java-cpp_multic_fastframed-framed-ip-ssl",
-  "java-cpp_multic_framed-ip-ssl",
-  "java-cpp_multic_zlib-ip-ssl",
-  "java-cpp_multij-json_buffered-ip-ssl",
-  "java-cpp_multij-json_fastframed-framed-ip-ssl",
-  "java-cpp_multij-json_framed-ip-ssl",
-  "java-cpp_multij-json_zlib-ip-ssl",
-  "java-cpp_multij_buffered-ip-ssl",
-  "java-cpp_multij_fastframed-framed-ip-ssl",
-  "java-cpp_multij_framed-ip-ssl",
-  "java-cpp_multij_zlib-ip-ssl",
   "java-erl_binary_buffered-ip-ssl",
   "java-erl_binary_fastframed-framed-ip-ssl",
   "java-erl_binary_framed-ip-ssl",