diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java
index dd020ba5c06..41704163d37 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java
@@ -23,6 +23,7 @@ import com.intellij.facet.impl.FacetUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.extensions.Extensions;
 import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest;
 import org.jetbrains.kotlin.idea.test.KotlinTestImportFilter;
 
@@ -44,7 +45,7 @@ public abstract class AbstractAndroidQuickFixMultiFileTest extends AbstractQuick
     }
 
     @Override
-    protected void doTestWithExtraFile(String beforeFileName) throws Exception {
+    protected void doTestWithExtraFile(@NotNull String beforeFileName) throws Exception {
         addManifest();
         super.doTestWithExtraFile(beforeFileName);
     }
@@ -53,14 +54,9 @@ public abstract class AbstractAndroidQuickFixMultiFileTest extends AbstractQuick
         FacetManager facetManager = FacetManager.getInstance(myModule);
         AndroidFacet facet = facetManager.createFacet(AndroidFacet.getFacetType(), "Android", null);
 
-        final ModifiableFacetModel facetModel = facetManager.createModifiableModel();
+        ModifiableFacetModel facetModel = facetManager.createModifiableModel();
         facetModel.addFacet(facet);
-        ApplicationManager.getApplication().runWriteAction(new Runnable() {
-            @Override
-            public void run() {
-                facetModel.commit();
-            }
-        });
+        ApplicationManager.getApplication().runWriteAction(facetModel::commit);
     }
 
     private void addManifest() throws Exception {