--- old/modules/controls/src/test/java/javafx/scene/control/DatePickerTest.java	2015-05-11 15:53:48.935036635 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/DatePickerTest.java	2015-05-11 15:53:48.839036634 -0700
@@ -432,9 +432,9 @@
 
         StageLoader sl = new StageLoader(dp);
 
-        dp.getEditor().requestFocus();
+        dp.requestFocus();
         dp.getEditor().setText("1/2/2015");
-        KeyEventFirer keyboard = new KeyEventFirer(dp.getEditor());
+        KeyEventFirer keyboard = new KeyEventFirer(dp);
         keyboard.doKeyPress(KeyCode.ENTER);
 
         assertEquals(1, test_rt35586_count);
@@ -592,8 +592,12 @@
         dp1Keyboard.doKeyPress(KeyCode.TAB, KeyModifier.SHIFT);
         assertTrue("Expect dp2 to be focused, but actual focus owner is: " + scene.getFocusOwner(),
                 dp2.isFocused());
-        assertEquals("Expect dp2 TextField to be focused, but actual focus owner is: " + scene.getFocusOwner(),
-                dp2.getEditor(), scene.getFocusOwner());
+        // Updated with fix for RT-34602: The TextField now never gets
+        // focus (it's just faking it).
+        // assertEquals("Expect dp2 TextField to be focused, but actual focus owner is: " + scene.getFocusOwner(),
+        //         dp2.getEditor(), scene.getFocusOwner());
+        assertEquals("Expect dp2 to be focused, but actual focus owner is: " + scene.getFocusOwner(),
+                     dp2, scene.getFocusOwner());
 
         // This is where the second half of the bug appears, as we are stuck in
         // the FakeFocusTextField of dp2, we never make it to dp1