diff --git a/tools/sh_commands.py b/tools/sh_commands.py
index 4be75b79fdcb345b2460e9818bdd9670c929968a..a824ba570ed44b76ec7c803b4645d503d7476594 100644
--- a/tools/sh_commands.py
+++ b/tools/sh_commands.py
@@ -111,7 +111,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'(\S+)\s+device')
     for line in split_stdout(sh.adb("devices")):
         m = p.match(line)
         if m: