diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt
new file mode 100644
index 00000000000..ed2897ad5d0
--- /dev/null
+++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt
@@ -0,0 +1,11 @@
+package test
+
+public open class Sub : test.Super {
+    public constructor Sub()
+    internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
+}
+
+public final class Super {
+    public constructor Super()
+    internal final fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
+}
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin/Sub.java b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin/Sub.java
new file mode 100644
index 00000000000..d617c4d0abc
--- /dev/null
+++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin/Sub.java
@@ -0,0 +1,4 @@
+package test;
+
+public class Sub extends Super {
+}
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin/Super.kt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin/Super.kt
new file mode 100644
index 00000000000..4d510b71def
--- /dev/null
+++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin/Super.kt
@@ -0,0 +1,5 @@
+package test
+
+public class Super {
+    fun foo(r: Runnable)
+}
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt
new file mode 100644
index 00000000000..18869710ad3
--- /dev/null
+++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt
@@ -0,0 +1,12 @@
+package test
+
+public open class Sub : test.Super {
+    public constructor Sub()
+    public open /*synthesized*/ fun foo(/*0*/ r: () -> jet.Unit): jet.Unit
+    public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
+}
+
+public final class Super {
+    public constructor Super()
+    internal final fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
+}
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin/Sub.java b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin/Sub.java
new file mode 100644
index 00000000000..fb3c0621486
--- /dev/null
+++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin/Sub.java
@@ -0,0 +1,6 @@
+package test;
+
+public class Sub extends Super {
+    public void foo(Runnable r) {
+    }
+}
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin/Super.kt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin/Super.kt
new file mode 100644
index 00000000000..4d510b71def
--- /dev/null
+++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin/Super.kt
@@ -0,0 +1,5 @@
+package test
+
+public class Super {
+    fun foo(r: Runnable)
+}
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index cee4e3bda85..cecefb2837e 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -1432,6 +1432,16 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt");
             }
             
+            @TestMetadata("SamAdapterForInheritedFromKotlin.txt")
+            public void testSamAdapterForInheritedFromKotlin() throws Exception {
+                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt");
+            }
+            
+            @TestMetadata("SamAdapterForOverriddenFromKotlin.txt")
+            public void testSamAdapterForOverriddenFromKotlin() throws Exception {
+                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt");
+            }
+            
             public static Test innerSuite() {
                 TestSuite suite = new TestSuite("SamAdapters");
                 suite.addTestSuite(SamAdapters.class);