diff --git a/hphp/test/vm/closure_gen_scope.php b/hphp/test/vm/closure_gen_scope.php
new file mode 100644
index 000000000..1a5f122b4
--- /dev/null
+++ b/hphp/test/vm/closure_gen_scope.php
@@ -0,0 +1,22 @@
+<?php
+
+class X {
+  private $priv = 'X';
+  function foo() {
+    return function ($x) {
+      yield $x->priv;
+    };
+  }
+}
+
+class Y extends X { private $priv = 'Y'; }
+class Z extends X { private $priv = 'Z'; }
+
+function test($x) {
+  $f = $x->foo();
+  foreach ($f($x) as $v) var_dump($v);
+}
+
+test(new X);
+test(new Y);
+test(new Z);
diff --git a/hphp/test/vm/closure_gen_scope.php.exp b/hphp/test/vm/closure_gen_scope.php.exp
new file mode 100644
index 000000000..68aac9d88
--- /dev/null
+++ b/hphp/test/vm/closure_gen_scope.php.exp
@@ -0,0 +1,3 @@
+string(1) "X"
+string(1) "X"
+string(1) "X"