diff --git a/tests/tests/text/AndroidManifest.xml b/tests/tests/text/AndroidManifest.xml
index 27bab8d..1ff9b4f 100644
--- a/tests/tests/text/AndroidManifest.xml
+++ b/tests/tests/text/AndroidManifest.xml
@@ -34,7 +34,9 @@
 
         <activity android:name="android.text.method.cts.KeyListenerCtsActivity"
             android:label="KeyListenerCtsActivity"
-            android:screenOrientation="nosensor"/>
+            android:screenOrientation="nosensor"
+            android:windowSoftInputMode="stateAlwaysHidden"
+        />
 
         <activity android:name="android.text.method.cts.CtsActivity"
             android:label="CtsActivity"
diff --git a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
index 313d380..ec9c48b 100644
--- a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
+++ b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
@@ -21,10 +21,8 @@
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.text.format.DateUtils;
-import android.text.method.cts.KeyListenerCtsActivity;
 import android.text.method.KeyListener;
 import android.view.KeyEvent;
-import android.view.WindowManager;
 import android.widget.EditText;
 
 /**
@@ -71,7 +69,7 @@
                 mTextView.setKeepScreenOn(true);
             }
         });
-
+        mInstrumentation.waitForIdleSync();
         assertTrue(mActivity.waitForWindowFocus(5 * DateUtils.SECOND_IN_MILLIS));
     }