diff --git a/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java b/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java
index aa61f69d6c1f..0e0ca18a4bf3 100644
--- a/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java
+++ b/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.psi.codeStyle.arrangement;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.lang.Language;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.components.ServiceManager;
@@ -23,7 +24,6 @@ import com.intellij.openapi.editor.FoldingModel;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.codeStyle.arrangement.engine.ArrangementEngine;
 import com.intellij.psi.codeStyle.arrangement.group.ArrangementGroupingRule;
@@ -62,18 +62,22 @@ public abstract class AbstractRearrangerTest extends LightPlatformCodeInsightFix
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    CodeStyleSettingsManager.getInstance(myFixture.getProject()).setTemporarySettings(new CodeStyleSettings());
+    CodeStyle.setTemporarySettings(myFixture.getProject(), new CodeStyleSettings());
   }
 
   @Override
   protected void tearDown() throws Exception {
-    CodeStyleSettingsManager.getInstance(myFixture.getProject()).dropTemporarySettings();
-    super.tearDown();
+    try {
+      CodeStyle.dropTemporarySettings(myFixture.getProject());
+    }
+    finally {
+      super.tearDown();
+    }
   }
 
   @NotNull
   protected CommonCodeStyleSettings getCommonSettings() {
-    return CodeStyleSettingsManager.getInstance(myFixture.getProject()).getCurrentSettings().getCommonSettings(language);
+    return CodeStyle.getSettings(myFixture.getProject()).getCommonSettings(language);
   }
 
   protected static ArrangementSectionRule section(@NotNull StdArrangementMatchRule... rules) {
@@ -183,7 +187,7 @@ public abstract class AbstractRearrangerTest extends LightPlatformCodeInsightFix
 
     @SuppressWarnings("unchecked")
     List<StdArrangementRuleAliasToken> aliases = (List<StdArrangementRuleAliasToken>)args.get("aliases");
-    CommonCodeStyleSettings settings = CodeStyleSettingsManager.getInstance(myFixture.getProject()).getCurrentSettings().getCommonSettings(language);
+    CommonCodeStyleSettings settings = CodeStyle.getSettings(myFixture.getProject()).getCommonSettings(language);
     final StdArrangementSettings arrangementSettings =
       aliases == null ?
       new StdArrangementSettings(groupingRules, sectionRules) :
diff --git a/platform/testFramework/src/com/intellij/psi/formatter/FormatterTestCase.java b/platform/testFramework/src/com/intellij/psi/formatter/FormatterTestCase.java
index 8694c18b5bee..5feadbb4cd69 100644
--- a/platform/testFramework/src/com/intellij/psi/formatter/FormatterTestCase.java
+++ b/platform/testFramework/src/com/intellij/psi/formatter/FormatterTestCase.java
@@ -24,7 +24,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.testFramework.LightPlatformTestCase;
 import com.intellij.util.IncorrectOperationException;
@@ -67,7 +66,7 @@ public abstract class FormatterTestCase extends LightPlatformTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    assertFalse(CodeStyleSettingsManager.getInstance(getProject()).USE_PER_PROJECT_SETTINGS);
+    assertFalse(CodeStyle.usesOwnSettings(getProject()));
   }
 
   protected void doTest(String resultNumber) throws Exception {