diff --git a/etc/ci/bootstrap-android-and-accept-licences.sh b/etc/ci/bootstrap-android-and-accept-licences.sh
new file mode 100755
index 00000000000..dde62438efa
--- /dev/null
+++ b/etc/ci/bootstrap-android-and-accept-licences.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# We enable pipefail above to satisfy servo-tidy, but disable it again here.
+# In the case of the 'yes' program,
+# exiting when the stdout pipe is broken is expected.
+set +o pipefail
+
+cd $(dirname ${0})/../..
+yes | ./mach bootstrap-android
diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml
index cee66deafa1..c7bf36eb315 100644
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@@ -160,7 +160,13 @@ android:
   - python ./etc/ci/check_dynamic_symbols.py
 
 android-x86:
-  - echo FIXME To be filled in once Buildbot is configured
+  - ./mach clean-nightlies --keep 3 --force
+  - ./mach clean-cargo-cache --keep 3 --force
+  - ./etc/ci/bootstrap-android-and-accept-licences.sh
+  - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --target i686-linux-android --release
+  - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach package --target i686-linux-android --release
+  - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-android-startup --release
+  - bash ./etc/ci/lockfile_changed.sh
 
 android-nightly:
   - ./mach clean-nightlies --keep 3 --force
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py
index 699981ff6d1..3be7a208815 100644
--- a/python/servo/bootstrap_commands.py
+++ b/python/servo/bootstrap_commands.py
@@ -58,10 +58,7 @@ class MachCommands(CommandBase):
     @Command('bootstrap-android',
              description='Install the Android SDK and NDK.',
              category='bootstrap')
-    @CommandArgument('--update',
-                     action='store_true',
-                     help='Run SDK component install and emulator image creation again')
-    def bootstrap_android(self, update=False):
+    def bootstrap_android(self):
 
         ndk = "android-ndk-r12b-{system}-{arch}"
         tools = "sdk-tools-{system}-4333796"