--- a/browser/config/mozconfigs/macosx64/code-coverage
+++ b/browser/config/mozconfigs/macosx64/code-coverage
@@ -1,11 +1,13 @@
 . "$topsrcdir/browser/config/mozconfigs/macosx64/nightly"
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 ac_add_options --disable-sandbox
 ac_add_options --disable-warnings-as-errors
 ac_add_options --enable-coverage
+# This is currently broken: https://bugzilla.mozilla.org/show_bug.cgi?id=1477305
+ac_add_options --disable-geckodriver
 
 export CFLAGS="-coverage"
 export CXXFLAGS="-coverage"
 export LDFLAGS="-coverage"

--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -6,16 +6,18 @@ ac_add_options --enable-debug
 # Android
 # Warning: Before increasing the with-android-min-sdk value, please note several places in and out
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i386-linux-android
 ac_add_options --with-android-min-sdk=16
+# geckodriver doesn't build currently: https://bugzilla.mozilla.org/show_bug.cgi?id=1477340
+ac_add_options --disable-geckodriver
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -2,16 +2,18 @@
 
 # Warning: Before increasing the with-android-min-sdk value, please note several places in and out
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i386-linux-android
 ac_add_options --with-android-min-sdk=16
+# geckodriver doesn't build currently: https://bugzilla.mozilla.org/show_bug.cgi?id=1477340
+ac_add_options --disable-geckodriver
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"