diff --git a/tests/common.TestCase b/tests/common.TestCase
index ecd16a8d..a5d52f75 100755
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -70,7 +70,10 @@ class CommonTest(unittest.TestCase):
             return False
 
     def _find_all(self):
-        for cmd in ('aapt', 'adb', 'android', 'zipalign'):
+        tools = ['aapt', 'adb', 'zipalign']
+        if os.path.exists(os.path.join(os.getenv('ANDROID_HOME'), 'tools', 'android')):
+            tools.append('android')
+        for cmd in tools:
             path = fdroidserver.common.find_sdk_tools_cmd(cmd)
             if path is not None:
                 self.assertTrue(os.path.exists(path))