diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java
index 8f8001759d1..6f178623465 100644
--- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java
+++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java
@@ -143,6 +143,9 @@ public void simulateKeyboardInteractionInFindInputField(int keyCode, boolean shi
 		if (shiftPressed) {
 			event.stateMask= SWT.SHIFT;
 		}
+		if (keyCode == SWT.CR | keyCode == SWT.KEYPAD_CR) {
+			event.character= '\r';
+		}
 		event.keyCode= keyCode;
 		find.getTextBar().notifyListeners(SWT.KeyDown, event);
 		runEventQueue();
diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java
index 9d5a10dddb0..f05203ec826 100644
--- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java
+++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java
@@ -175,6 +175,9 @@ public void simulateKeyboardInteractionInFindInputField(int keyCode, boolean shi
 		if (shiftPressed) {
 			event.stateMask= SWT.SHIFT;
 		}
+		if (keyCode == SWT.CR | keyCode == SWT.KEYPAD_CR) {
+			event.character= '\r';
+		}
 		event.keyCode= keyCode;
 		findCombo.traverse(SWT.TRAVERSE_RETURN, event);
 		runEventQueue();