diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6e5ccca3e24..d1ca2e70450 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -70,7 +70,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="PsiViewerSettings">
diff --git a/gradle/testRetry.gradle.kts b/gradle/testRetry.gradle.kts
index 0cbdbe22aa5..0dcf222d5aa 100644
--- a/gradle/testRetry.gradle.kts
+++ b/gradle/testRetry.gradle.kts
@@ -1,9 +1,12 @@
 
 apply(plugin = "org.gradle.test-retry")
 
+val testRetryMaxRetries = findProperty("kotlin.build.testRetry.maxRetries")?.toString()?.toInt() ?:
+    (if (kotlinBuildProperties.isTeamcityBuild) 3 else 0)
+
 tasks.withType<Test>().configureEach {
     configure<org.gradle.testretry.TestRetryTaskExtension> {
-        maxRetries.set(if (kotlinBuildProperties.isTeamcityBuild) 3 else 0)
+        maxRetries.set(testRetryMaxRetries)
         maxFailures.set(20)
         failOnPassedAfterRetry.set(false)
     }