diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/GenerateConstructorTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/GenerateConstructorTest.java
index 5ef9e70a8093..6e626975d146 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/GenerateConstructorTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/GenerateConstructorTest.java
@@ -17,6 +17,7 @@ package com.intellij.codeInsight;
 
 import com.intellij.codeInsight.generation.ClassMember;
 import com.intellij.codeInsight.generation.GenerateConstructorHandler;
+import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -43,7 +44,9 @@ public class GenerateConstructorTest extends LightCodeInsightTestCase {
   }
 
   public void testBoundCommentsKeepsBlankLine() throws Exception {
-    CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings().BLANK_LINES_AFTER_CLASS_HEADER = 1;
+    CommonCodeStyleSettings javaSettings =
+      CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings().getCommonSettings(JavaLanguage.INSTANCE);
+    javaSettings.BLANK_LINES_AFTER_CLASS_HEADER = 1;
     doTest();
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/JoinLinesTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/JoinLinesTest.java
index 0508a14042fa..dc8b0085dc22 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/JoinLinesTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/JoinLinesTest.java
@@ -195,7 +195,7 @@ public class JoinLinesTest extends LightCodeInsightTestCase {
     // Inspired by IDEA-65342
     CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     settings.setDefaultRightMargin(50);
-    settings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
+    settings.getCommonSettings(JavaLanguage.INSTANCE).CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     doTest(2);
   }
   
diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
index 7cf1de7b16bc..ead8a4bcb6e6 100644
--- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
@@ -1,8 +1,10 @@
 package com.intellij.refactoring;
 
+import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.typeMigration.TypeMigrationRules;
@@ -767,8 +769,9 @@ public class TypeMigrationTest extends TypeMigrationTestBase {
 
   // Checking preserving method parameters alignment
   public void testT127() {
-    getCurrentCodeStyleSettings().ALIGN_MULTILINE_PARAMETERS = true;
-    getCurrentCodeStyleSettings().ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
+    CommonCodeStyleSettings javaSettings = getCurrentCodeStyleSettings().getCommonSettings(JavaLanguage.INSTANCE);
+    javaSettings.ALIGN_MULTILINE_PARAMETERS = true;
+    javaSettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
     doTestMethodType("test234",
                      myFactory.createTypeFromText("int", null),
                      myFactory.createTypeFromText("long", null));