diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e9ca6dc2..92e559e1 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -42,7 +42,7 @@ def get_default_config():
     return {
         'sdk_path': os.getenv("ANDROID_HOME"),
         'ndk_path': os.getenv("ANDROID_NDK"),
-        'build_tools': "19.1",
+        'build_tools': "19.1.0",
         'ant': "ant",
         'mvn3': "mvn",
         'gradle': 'gradle',
diff --git a/tests/run-tests b/tests/run-tests
index 5579fda2..4b73117e 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -25,8 +25,8 @@ copy_apks_into_repo() {
 
 create_fake_android_home() {
     mkdir $1/build-tools
-    mkdir $1/build-tools/19.1
-    touch $1/build-tools/19.1/aapt
+    mkdir $1/build-tools/19.1.0
+    touch $1/build-tools/19.1.0/aapt
 }
 
 create_test_dir() {