diff --git a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
index 6e4212830744..d2e5af5ae245 100644
--- a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import com.intellij.testFramework.LightIdeaTestCase;
 import com.intellij.testFramework.PlatformTestUtil;
 
 import java.io.File;
+import java.io.IOException;
 import java.security.SecureRandom;
 
 @SuppressWarnings("SpellCheckingInspection")
@@ -511,12 +512,12 @@ public class JavaStubBuilderTest extends LightIdeaTestCase {
     System.out.println("SOE depth=" + i + ", time=" + t + "ms");
   }
 
-  public void testPerformance() throws Exception {
+  public void testPerformance() throws IOException {
     String path = PathManagerEx.getTestDataPath() + "/psi/stub/StubPerformanceTest.java";
     String text = FileUtil.loadFile(new File(path));
     PsiJavaFile file = (PsiJavaFile)createLightFile("test.java", text);
     String message = "Source file size: " + text.length();
-    PlatformTestUtil.startPerformanceTest(message, 2000, () -> myBuilder.buildStubTree(file)).cpuBound().useLegacyScaling().assertTiming();
+    PlatformTestUtil.startPerformanceTest(message, 4000, () -> myBuilder.buildStubTree(file)).cpuBound().assertTiming();
   }
 
   private void doTest(String source, String expected) {
@@ -535,4 +536,4 @@ public class JavaStubBuilderTest extends LightIdeaTestCase {
     assertEquals("light tree differs", expected, DebugUtil.stubTreeToString(lightTree));
     assertEquals("AST-based tree differs", expected, DebugUtil.stubTreeToString(astBasedTree));
   }
-}
+}
\ No newline at end of file
diff --git a/spellchecker/src/com/intellij/spellchecker/jetbrains.dic b/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
index 388417291359..031d9906b27a 100644
--- a/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
+++ b/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
@@ -574,6 +574,8 @@ strictfp
 stringify
 stylesheet
 stylesheets
+subexpression
+subexpressions
 sublicense
 subpackage
 subpackages
@@ -588,6 +590,8 @@ subview
 subviews
 superclass
 superclasses
+superinterface
+superinterfaces
 superview
 superviews
 sybase