diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ca88fee2..df9ffe25 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -114,7 +114,7 @@ default_config = {
         'r16b': None,
     },
     'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
-    'build_tools': MINIMUM_AAPT_BUILD_TOOLS_VERSION,
+    'build_tools': MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION,
     'java_paths': None,
     'scan_binary': False,
     'ant': "ant",
@@ -508,6 +508,7 @@ def test_aapt_version(aapt):
 
 def test_sdk_exists(thisconfig):
     if 'sdk_path' not in thisconfig:
+        # TODO convert this to apksigner once it is required
         if 'aapt' in thisconfig and os.path.isfile(thisconfig['aapt']):
             test_aapt_version(thisconfig['aapt'])
             return True
diff --git a/tests/common.TestCase b/tests/common.TestCase
index 99e10e08..4e887d3c 100755
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -78,7 +78,7 @@ class CommonTest(unittest.TestCase):
             for f in sorted(os.listdir(build_tools), reverse=True):
                 versioned = os.path.join(build_tools, f)
                 if os.path.isdir(versioned) \
-                        and os.path.isfile(os.path.join(versioned, 'aapt')):
+                        and os.path.isfile(os.path.join(versioned, 'apksigner')):
                     fdroidserver.common.config['build_tools'] = versioned
                     break
             return True