diff --git a/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java b/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java
index 75e29a1d15e..5af6cbbce62 100644
--- a/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java
+++ b/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java
@@ -115,9 +115,9 @@ public class Enable16KbTest extends BaseHostJUnit4Test {
 
     private void prepareDevice() throws Exception {
         // Verify that device is online before running test and enable root
-        getDevice().waitForDeviceOnline(DEVICE_WAIT_TIMEOUT);
+        getDevice().waitForDeviceAvailable(DEVICE_WAIT_TIMEOUT);
         getDevice().enableAdbRoot();
-        getDevice().waitForDeviceOnline(DEVICE_WAIT_TIMEOUT);
+        getDevice().waitForDeviceAvailable(DEVICE_WAIT_TIMEOUT);
 
         getDevice().executeShellCommand("input keyevent KEYCODE_WAKEUP");
         getDevice().executeShellCommand("wm dismiss-keyguard");