diff --git a/tools/sh_commands.py b/tools/sh_commands.py
index 3d5eb78c4c5c3db4e58a8542b6fb800aad841991..0340f3d5a8e24d56ccfc3f54724bdb551f34b8af 100644
--- a/tools/sh_commands.py
+++ b/tools/sh_commands.py
@@ -115,7 +115,7 @@ def clear_phone_data_dir(serialno, phone_data_dir):
 ################################
 def adb_devices():
     serialnos = []
-    p = re.compile(r'(\w+)\s+device')
+    p = re.compile(r'([\w|-]+)\s+device')
     for line in split_stdout(sh.adb("devices")):
         m = p.match(line)
         if m: