diff --git a/.travis.yml b/.travis.yml
index 0a10bcb0..a012541b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,11 @@ language: java
 matrix:
   include:
     - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode12
       env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
       env: ANDROID_HOME=/usr/local/share/android-sdk
     - os: osx
-      osx_image: xcode9.3
-      env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
-      env: ANDROID_HOME=/usr/local/share/android-sdk
-    - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode10.3
       env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
       env: ANDROID_HOME=/usr/local/share/android-sdk
 
@@ -49,7 +45,7 @@ install:
   - travis_retry brew cask install adoptopenjdk8
   - travis_retry brew cask install android-sdk
 
-  - export AAPT_VERSION=`sed -n "s,^MINIMUM_AAPT_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
+  - export AAPT_VERSION=`sed -n "s,^MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
   - mkdir -p "$ANDROID_HOME/licenses"
   - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
   - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"