diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index a09a4065..ffc9cca0 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -1,6 +1,6 @@
 sdk_path = "/home/vagrant/android-sdk"
 ndk_path = "/home/vagrant/android-ndk"
-build_tools = "19.1.0"
+build_tools = "20.0.0"
 ant = "ant"
 mvn3 = "mvn"
 gradle = "gradle"
diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 74128833..9635afdd 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -32,7 +32,7 @@ end
 script "add_build_tools" do
   interpreter "bash"
   user user
-  ver = "19.1.0"
+  ver = "20.0.0"
   cwd "/tmp"
   code "
     if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
diff --git a/examples/config.py b/examples/config.py
index ed34e648..1eee3f1f 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -9,7 +9,7 @@
 # Override the path to the Android NDK, $ANDROID_NDK by default
 # ndk_path = "/path/to/android-ndk"
 # Build tools version to be used
-build_tools = "19.0.2"
+build_tools = "20.0.0"
 
 # Command for running Ant
 # ant = "/path/to/ant"
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 79ac0b31..928610e0 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.0",
+        'build_tools': "20.0.0",
         'ant': "ant",
         'mvn3': "mvn",
         'gradle': 'gradle',
diff --git a/tests/run-tests b/tests/run-tests
index a3b5e76b..11aa2deb 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.0
-    touch $1/build-tools/19.1.0/aapt
+    mkdir $1/build-tools/20.0.0
+    touch $1/build-tools/20.0.0/aapt
 }
 
 create_test_dir() {