diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp
index baf118cc7..37d214b2e 100644
--- a/hphp/runtime/vm/bytecode.cpp
+++ b/hphp/runtime/vm/bytecode.cpp
@@ -2386,8 +2386,9 @@ Array VMExecutionContext::debugBacktrace(bool skip /* = false */,
     if (fp->m_func->isNoInjection()) {
       continue;
     }
-    // Builtins don't have a file and line number
-    if (prevFp && !prevFp->m_func->isBuiltin()) {
+    // Builtins don't have a file and line number and Zend 5.5 does not
+    // include this information for generators
+    if (prevFp && !prevFp->m_func->isBuiltin() && !fp->m_func->isGenerator()) {
       Unit* unit = prevFp->m_func->unit();
       assert(unit);
       const char *filename = unit->filepath()->data();
diff --git a/hphp/test/vm/debug_backtrace_continuation.php.exp b/hphp/test/vm/debug_backtrace_continuation.php.exp
index 24b4a558e..4474399c6 100644
--- a/hphp/test/vm/debug_backtrace_continuation.php.exp
+++ b/hphp/test/vm/debug_backtrace_continuation.php.exp
@@ -1,10 +1,6 @@
 array(3) {
   [0]=>
-  array(4) {
-    ["file"]=>
-    string(0) ""
-    ["line"]=>
-    int(-1)
+  array(2) {
     ["function"]=>
     string(12) "my_generator"
     ["args"]=>