2 files changed, 31 insertions, 2 deletions
diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala
index 9778c72..2af691f 100644
--- a/src/test/scala/scala/async/neg/NakedAwait.scala
+++ b/src/test/scala/scala/async/neg/NakedAwait.scala
@@ -163,10 +163,10 @@ class NakedAwait {
 
   @Test
   def lazyValIllegal() {
-    expectError("lazy vals are illegal") {
+    expectError("await must not be used under a lazy val initializer") {
       """
         | import _root_.scala.async.internal.AsyncId._
-        | def foo(): Any = async { val x = { lazy val y = 0; y } }
+        | def foo(): Any = async { val x = { lazy val y = await(0); y } }
         | ()
         |
         |""".stripMargin
diff --git a/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala b/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala
new file mode 100644
index 0000000..701d5d6
--- /dev/null
+++ b/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package scala.async
+package run
+package lazyval
+
+import org.junit.Test
+import scala.async.internal.AsyncId._
+
+class LazyValSpec {
+  @Test
+  def lazyValAllowed() {
+    val result = async {
+      var x = 0
+      lazy val y = { x += 1; 42 }
+      assert(x == 0, x)
+      val z = await(1)
+      val result = y + x
+      assert(x == 1, x)
+      identity(y)
+      assert(x == 1, x)
+      result
+    }
+    result mustBe 43
+  }
+}
+