diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 83db194..1808d14 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -105,7 +105,7 @@ public class SingleClassesTest {
   @Test public void testPop2OneLongPop2() { doTest("pkg/TestPop2OneLongPop2"); }
   @Test public void testPop2TwoIntPop2() { doTest("pkg/TestPop2TwoIntPop2"); }
   @Test public void testPop2TwoIntTwoPop() { doTest("pkg/TestPop2TwoIntTwoPop"); }
-  @Test public void testSuperInner2() { doTest("pkg/TestSuperInner2", "pkg/TestSuperInner"); }
+  @Test public void testSuperInner() { doTest("pkg/TestSuperInner", "pkg/TestSuperInnerBase"); }
 
   // TODO: fix all below
   //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
diff --git a/testData/classes/pkg/TestSuperInner$Inner.class b/testData/classes/pkg/TestSuperInner$Inner.class
deleted file mode 100644
index 1148567..0000000
Binary files a/testData/classes/pkg/TestSuperInner$Inner.class and /dev/null differ
diff --git a/testData/classes/pkg/TestSuperInner$Inner2.class b/testData/classes/pkg/TestSuperInner$Inner2.class
new file mode 100644
index 0000000..b7b9df5
Binary files /dev/null and b/testData/classes/pkg/TestSuperInner$Inner2.class differ
diff --git a/testData/classes/pkg/TestSuperInner.class b/testData/classes/pkg/TestSuperInner.class
index 52fd2e2..0629d9c 100644
Binary files a/testData/classes/pkg/TestSuperInner.class and b/testData/classes/pkg/TestSuperInner.class differ
diff --git a/testData/classes/pkg/TestSuperInner2$Inner2.class b/testData/classes/pkg/TestSuperInner2$Inner2.class
deleted file mode 100644
index ef383b8..0000000
Binary files a/testData/classes/pkg/TestSuperInner2$Inner2.class and /dev/null differ
diff --git a/testData/classes/pkg/TestSuperInner2.class b/testData/classes/pkg/TestSuperInner2.class
deleted file mode 100644
index 340b4de..0000000
Binary files a/testData/classes/pkg/TestSuperInner2.class and /dev/null differ
diff --git a/testData/classes/pkg/TestSuperInnerBase$Inner.class b/testData/classes/pkg/TestSuperInnerBase$Inner.class
new file mode 100644
index 0000000..bb6539f
Binary files /dev/null and b/testData/classes/pkg/TestSuperInnerBase$Inner.class differ
diff --git a/testData/classes/pkg/TestSuperInnerBase.class b/testData/classes/pkg/TestSuperInnerBase.class
new file mode 100644
index 0000000..2295e71
Binary files /dev/null and b/testData/classes/pkg/TestSuperInnerBase.class differ
diff --git a/testData/results/TestSuperInner.dec b/testData/results/TestSuperInner.dec
new file mode 100644
index 0000000..840aa69
--- /dev/null
+++ b/testData/results/TestSuperInner.dec
@@ -0,0 +1,19 @@
+package pkg;
+
+class TestSuperInner extends TestSuperInnerBase {
+   protected abstract class Inner2 extends TestSuperInnerBase.Inner {
+      protected Inner2() {
+         super();// 4
+      }
+   }
+}
+
+class 'pkg/TestSuperInner$Inner2' {
+   method '<init> (Lpkg/TestSuperInner;)V' {
+      7      5
+      a      6
+   }
+}
+
+Lines mapping:
+4 <-> 6
diff --git a/testData/results/TestSuperInner2.dec b/testData/results/TestSuperInner2.dec
deleted file mode 100644
index 81fbd8e..0000000
--- a/testData/results/TestSuperInner2.dec
+++ /dev/null
@@ -1,17 +0,0 @@
-class TestSuperInner2 extends TestSuperInner {
-   protected class Inner2 extends TestSuperInner.Inner {
-      protected Inner2() {
-         super();// 2
-      }
-   }
-}
-
-class 'TestSuperInner2$Inner2' {
-   method '<init> (LTestSuperInner2;)V' {
-      7      3
-      a      4
-   }
-}
-
-Lines mapping:
-2 <-> 4
diff --git a/testData/src/pkg/TestSuperInner.java b/testData/src/pkg/TestSuperInner.java
index fed5da8..b5251ba 100644
--- a/testData/src/pkg/TestSuperInner.java
+++ b/testData/src/pkg/TestSuperInner.java
@@ -1,6 +1,5 @@
-public class TestSuperInner {
-  protected abstract class Inner {
-    protected Inner() {
-    }
-  }
+package pkg;
+
+class TestSuperInner extends TestSuperInnerBase {
+  protected abstract class Inner2 extends Inner { }
 }
\ No newline at end of file
diff --git a/testData/src/pkg/TestSuperInner2.java b/testData/src/pkg/TestSuperInner2.java
deleted file mode 100644
index a16ba8e..0000000
--- a/testData/src/pkg/TestSuperInner2.java
+++ /dev/null
@@ -1,4 +0,0 @@
-class TestSuperInner2 extends TestSuperInner {
-  protected class Inner2 extends Inner {
-  }
-}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSuperInnerBase.java b/testData/src/pkg/TestSuperInnerBase.java
new file mode 100644
index 0000000..e53ec09
--- /dev/null
+++ b/testData/src/pkg/TestSuperInnerBase.java
@@ -0,0 +1,7 @@
+package pkg;
+
+class TestSuperInnerBase {
+  protected abstract class Inner {
+    protected Inner() { }
+  }
+}
\ No newline at end of file