diff --git a/.travis.yml b/.travis.yml
index 3752d905564..8d5f2bf83e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,19 +42,9 @@ matrix:
            CFG_DISABLE_CROSS_TESTS=1
            MAKE_TARGETS=test-unit-$TARGET
 
-    # android targets
-    - env: TARGET=i686-linux-android
-           IMAGE=android
-    - env: TARGET=arm-linux-androideabi
-           IMAGE=android
+    # cross compiled targets
     - env: TARGET=armv7-linux-androideabi
            IMAGE=android
-    # Use nightly because of https://github.com/rust-lang/rust/issues/40903
-    - env: TARGET=i686-linux-android
-           IMAGE=android
-      rust: nightly
-
-    # cross compiled targets
     - env: TARGET=arm-unknown-linux-gnueabi
            IMAGE=cross
     - env: TARGET=arm-unknown-linux-gnueabihf
diff --git a/Makefile.in b/Makefile.in
index b1c85ebe5e4..f32d211fcbd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,7 @@ $(DOC_DIR)/%: $(S)src/doc/%
 	@mkdir -p $(@D)
 	cp $< $@
 
-OPENSSL_OS_aarch64-linux-android := linux-generic64
+OPENSSL_OS_aarch64-linux-android := linux-aarch64
 OPENSSL_OS_aarch64-unknown-linux-gnu := linux-aarch64
 OPENSSL_OS_arm-linux-androideabi := android
 OPENSSL_OS_arm-unknown-linux-gnueabi := linux-armv4
diff --git a/src/ci/docker/android/Dockerfile b/src/ci/docker/android/Dockerfile
index a53a8ed2d77..3125ae7b616 100644
--- a/src/ci/docker/android/Dockerfile
+++ b/src/ci/docker/android/Dockerfile
@@ -19,18 +19,9 @@ RUN apt-get install -y --no-install-recommends \
     unzip -q android-ndk-r13b-linux-x86_64.zip && \
     ./android-ndk-r13b/build/tools/make_standalone_toolchain.py \
       --install-dir /android-ndk/arm --arch arm --api 21 && \
-    ./android-ndk-r13b/build/tools/make_standalone_toolchain.py \
-      --install-dir /android-ndk/arm64 --arch arm64 --api 21 && \
-    ./android-ndk-r13b/build/tools/make_standalone_toolchain.py \
-      --install-dir /android-ndk/x86 --arch x86 --api 21 && \
     rm -rf ./android-ndk-r13b-linux-x86_64.zip ./android-ndk-r13b && \
     apt-get purge --auto-remove -y unzip python
 
 ENV PATH=$PATH:/android-ndk/arm/bin
-ENV PATH=$PATH:/android-ndk/arm64/bin
-ENV PATH=$PATH:/android-ndk/x86/bin
 
-ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
-    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
-    CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
-    CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc
+ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 4ffc410be14..a42d38f689d 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -49,19 +49,9 @@ fi
 
 # For some unknown reason libz is not found in the android docker image, so we
 # use this workaround
-case $TARGET in
-  arm-linux-androideabi | armv7-linux-androideabi )
+if [ "$TARGET" = armv7-linux-androideabi ]; then
     export DEP_Z_ROOT=/android-ndk/arm/sysroot/usr
-    ;;
-
-  aarch64-linux-android )
-    export DEP_Z_ROOT=/android-ndk/arm64/sysroot/usr/
-    ;;
-
-  i686-linux-android )
-    export DEP_Z_ROOT=/android-ndk/x86/sysroot/usr/
-    ;;
-esac
+fi
 
 $SRC/configure \
     --prefix=/tmp/obj/install \