diff --git a/scripts/fiber/tests-failing.txt b/scripts/fiber/tests-failing.txt
index 8f5c60c510..9e444afc1c 100644
--- a/scripts/fiber/tests-failing.txt
+++ b/scripts/fiber/tests-failing.txt
@@ -137,9 +137,6 @@ src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
 * should listen for both change and input events when supported
 * should only fire events when the value changes for range inputs
 
-src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
-* should set relatedTarget properly in iframe
-
 src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
 * should skip extraction if no listeners are present
 * should extract if an `onSelect` listener is present
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 8330f2a9f3..93d0725443 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -605,6 +605,9 @@ src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
 src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
 * should unmount
 
+src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
+* should set relatedTarget properly in iframe
+
 src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js
 * extracts value via `getText()`
 * extracts when inserted at start of text
diff --git a/src/renderers/shared/shared/event/EventPluginHub.js b/src/renderers/shared/shared/event/EventPluginHub.js
index 60df9a3553..e39c1d3a6a 100644
--- a/src/renderers/shared/shared/event/EventPluginHub.js
+++ b/src/renderers/shared/shared/event/EventPluginHub.js
@@ -96,7 +96,14 @@ var EventPluginHub = {
    * @return {?function} The stored callback.
    */
   getListener: function(inst, registrationName) {
-    var listener = inst._currentElement.props[registrationName];
+    var listener;
+    if (typeof inst.tag === 'number') {
+      // TODO: This is not safe because we might want the *other* Fiber's
+      // props depending on which is the current one.
+      listener = inst.memoizedProps[registrationName];
+    } else {
+      listener = inst._currentElement.props[registrationName];
+    }
     invariant(
       !listener || typeof listener === 'function',
       'Expected %s listener to be a function, instead got type %s',