diff --git a/lib/units/device/support/adb.js b/lib/units/device/support/adb.js
index fdb9c1ff..c2cdf8b1 100644
--- a/lib/units/device/support/adb.js
+++ b/lib/units/device/support/adb.js
@@ -1,6 +1,7 @@
 var syrup = require('@devicefarmer/stf-syrup')
 
 var adbkit = require('@devicefarmer/adbkit').Adb
+var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
 
 var logger = require('../../../util/logger')
 var promiseutil = require('../../../util/promiseutil')
@@ -16,7 +17,7 @@ module.exports = syrup.serial()
 
     function ensureBootComplete() {
       return promiseutil.periodicNotify(
-          adb.waitBootComplete(options.serial)
+          new DeviceClient(adb, options.serial).waitBootComplete()
         , 1000
         )
         .progressed(function() {