3 files changed, 16 insertions, 1 deletions
diff --git a/test/files/run/reify_newimpl_45.scala b/test/files/run/reify_newimpl_45.scala
index d2254d6dde..cbae0839b2 100644
--- a/test/files/run/reify_newimpl_45.scala
+++ b/test/files/run/reify_newimpl_45.scala
@@ -8,7 +8,8 @@ object Test extends App {
     val code = reify{val x: T = "2".asInstanceOf[T]; println("ima worx: %s".format(x)); x}
     println(code.tree.freeTypes)
     val T = code.tree.freeTypes(0)
-    cm.mkToolBox().runExpr(code.tree, Map(T -> definitions.StringClass.asType))
+    val tree = code.tree.substituteSymbols(List(T), List(definitions.StringClass))
+    cm.mkToolBox().runExpr(tree)
   }
 
   new C[String]
diff --git a/test/files/run/toolbox_typecheck_inferimplicitvalue.check b/test/files/run/toolbox_typecheck_inferimplicitvalue.check
new file mode 100644
index 0000000000..23ba536aff
--- /dev/null
+++ b/test/files/run/toolbox_typecheck_inferimplicitvalue.check
@@ -0,0 +1 @@
+C.MC
diff --git a/test/files/run/toolbox_typecheck_inferimplicitvalue.scala b/test/files/run/toolbox_typecheck_inferimplicitvalue.scala
new file mode 100644
index 0000000000..3c5c994ac9
--- /dev/null
+++ b/test/files/run/toolbox_typecheck_inferimplicitvalue.scala
@@ -0,0 +1,13 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
+class C
+object C {
+  implicit object MC extends C
+}
+
+object Test extends App {
+  val tb = cm.mkToolBox()
+  println(tb.inferImplicitValue(typeOf[C]))
+}
+\ No newline at end of file