3 files changed, 24 insertions, 0 deletions
diff --git a/test/files/pos/bug2693.scala b/test/files/pos/bug2693.scala
new file mode 100644
index 0000000000..97732cf081
--- /dev/null
+++ b/test/files/pos/bug2693.scala
@@ -0,0 +1,6 @@
+class A {
+  trait T[A]
+  def usetHk[T[_], A](ta: T[A]) = 0
+  usetHk(new T[Int]{}: T[Int])
+  usetHk(new T[Int]{}) // fails with: found: java.lang.Object with T[Int], required: ?T[ ?A ]
+}
+\ No newline at end of file
diff --git a/test/files/run/bug3964.check b/test/files/run/bug3964.check
new file mode 100644
index 0000000000..55569e49e6
--- /dev/null
+++ b/test/files/run/bug3964.check
@@ -0,0 +1,2 @@
+42
+-21
diff --git a/test/files/run/bug3964.scala b/test/files/run/bug3964.scala
new file mode 100644
index 0000000000..df1eb716e8
--- /dev/null
+++ b/test/files/run/bug3964.scala
@@ -0,0 +1,16 @@
+object Test {
+  class Base
+  object Bob extends Base
+  class Foo { def bippy = 42 }
+  class Oof { def bippy = -21 }
+
+  // I am more specific than you
+  implicit def f1(x: Bob.type): Foo = new Foo
+  implicit def f2(x: Base): Oof = new Oof
+
+  def main(args: Array[String]): Unit = {
+    // this would of course print an unambiguous 42
+    println(Bob.bippy)
+    println((new Base).bippy)
+  }
+}