diff --git a/gradle/javaTestProject.gradle b/gradle/javaTestProject.gradle
index 3672f49076..6871eeb856 100644
--- a/gradle/javaTestProject.gradle
+++ b/gradle/javaTestProject.gradle
@@ -154,12 +154,12 @@ def initTestJVM(Task task, String rootDirName) {
 			'-XX:ParallelGCThreads=8',
 			'-XX:+UseParallelGC',
 			'-Djava.awt.headless=false',
-			// Dont' run this long winded analysis when testing (see DecompilerFunctionAnalyzer)
-			'-DDecompilerFunctionAnalyzer.enabled=false',
-			'-Djava.util.Arrays.useLegacyMergeSort=true',
+			'-DDecompilerFunctionAnalyzer.enabled=false', // prevent long-winded analysis when testing (see DecompilerFunctionAnalyzer)
+			'-Dfile.encoding=UTF8',
+			'-Duser.country=US',
+			'-Duser.language=en',
 			'-Djdk.attach.allowAttachSelf',
-			'-javaagent:' + jmockitPath,
-			
+			'-javaagent:' + jmockitPath,			
 			'-DLock.DEBUG=true',
 			'-Xdebug',
 			'-Xnoagent',
diff --git a/gradle/root/test.gradle b/gradle/root/test.gradle
index 214fd9a6bd..02e538b5bc 100644
--- a/gradle/root/test.gradle
+++ b/gradle/root/test.gradle
@@ -286,7 +286,7 @@ def initTestJVM(Task task, String rootDirName) {
 			'-XX:ParallelGCThreads=8',
 			'-XX:+UseParallelGC',
 			'-Djava.awt.headless=false',
-			'-DDecompilerFunctionAnalyzer.enabled=false', // prvent long-winded analysis when testing (see DecompilerFunctionAnalyzer)
+			'-DDecompilerFunctionAnalyzer.enabled=false', // prevent long-winded analysis when testing (see DecompilerFunctionAnalyzer)
 			'-Dfile.encoding=UTF8',
 			'-Duser.country=US',
 			'-Duser.language=en',