diff --git a/.travis.yml b/.travis.yml
index cc312b054..dbbe8ac24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,28 @@ matrix:
         - build-tools-26.0.2
       dist: trusty
 
+    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=stable
+      rust: stable
+      os: linux
+      language: android
+      android:
+        components:
+        - android-18
+        - build-tools-26.0.2
+        - sys-img-armeabi-v7a-android-18
+      dist: trusty
+
+    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=stable
+      rust: stable
+      os: linux
+      language: android
+      android:
+        components:
+        - android-18
+        - build-tools-26.0.2
+        - sys-img-armeabi-v7a-android-18
+      dist: trusty
+
     - env: TARGET_X=x86_64-unknown-linux-gnu  FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=stable
       rust: stable
       os: linux
@@ -239,6 +261,28 @@ matrix:
         - build-tools-26.0.2
       dist: trusty
 
+    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=nightly
+      rust: nightly
+      os: linux
+      language: android
+      android:
+        components:
+        - android-18
+        - build-tools-26.0.2
+        - sys-img-armeabi-v7a-android-18
+      dist: trusty
+
+    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=nightly
+      rust: nightly
+      os: linux
+      language: android
+      android:
+        components:
+        - android-18
+        - build-tools-26.0.2
+        - sys-img-armeabi-v7a-android-18
+      dist: trusty
+
     - env: TARGET_X=x86_64-unknown-linux-gnu  FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=nightly
       rust: nightly
       os: linux
@@ -448,6 +492,28 @@ matrix:
         - build-tools-26.0.2
       dist: trusty
 
+    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=beta
+      rust: beta
+      os: linux
+      language: android
+      android:
+        components:
+        - android-18
+        - build-tools-26.0.2
+        - sys-img-armeabi-v7a-android-18
+      dist: trusty
+
+    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=beta
+      rust: beta
+      os: linux
+      language: android
+      android:
+        components:
+        - android-18
+        - build-tools-26.0.2
+        - sys-img-armeabi-v7a-android-18
+      dist: trusty
+
     - env: TARGET_X=x86_64-unknown-linux-gnu  FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=beta
       rust: beta
       os: linux
diff --git a/mk/travis.sh b/mk/travis.sh
index 5dec6d732..6474c1c55 100755
--- a/mk/travis.sh
+++ b/mk/travis.sh
@@ -27,10 +27,14 @@ arm-unknown-linux-gnueabihf)
   export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
   ;;
 aarch64-linux-android)
+  # XXX: Tests are built but not run because we couldn't get the emulator to work; see
+  # https://github.com/briansmith/ring/issues/838
   export ANDROID_ABI=aarch64
   ;;
 armv7-linux-androideabi)
-  export ANDROID_SYSTEM_IMAGE="system-images;android-18;default;armeabi-v7a"
+  # XXX: Tests are built but not run because we couldn't get the emulator to work; see
+  # https://github.com/briansmith/ring/issues/838
+  # export ANDROID_SYSTEM_IMAGE="system-images;android-18;default;armeabi-v7a"
   export ANDROID_ABI=armeabi-v7a
   ;;
 esac
diff --git a/mk/update-travis-yml.py b/mk/update-travis-yml.py
index ea61e078e..446848411 100755
--- a/mk/update-travis-yml.py
+++ b/mk/update-travis-yml.py
@@ -73,7 +73,7 @@ targets = {
     ],
     "linux" : [
         "aarch64-linux-android",
-        # TODO: Emulator is broken "armv7-linux-androideabi",
+        "armv7-linux-androideabi",
         "x86_64-unknown-linux-gnu",
         "aarch64-unknown-linux-gnu",
         "i686-unknown-linux-gnu",