diff --git a/python-packages/adb/test_device.py b/python-packages/adb/test_device.py
index a1e659fd9..20f8d17a0 100644
--- a/python-packages/adb/test_device.py
+++ b/python-packages/adb/test_device.py
@@ -383,7 +383,7 @@ def get_md5_prog(device):
     try:
         device.shell(['md5sum', '/proc/uptime'])
         return 'md5sum'
-    except subprocess.CalledProcessError:
+    except adb.ShellError:
         return 'md5'