--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -21,17 +21,16 @@ MOZ_SAFE_BROWSING=1
 
 MOZ_NO_SMART_CARDS=1
 MOZ_APP_STATIC_INI=1
 MOZ_NO_EV_CERTS=1
 
 if test -n "$NIGHTLY_BUILD"; then
 MOZ_WEBSPEECH_MODELS=1
 fi
-MOZ_WEBSPEECH_TEST_BACKEND=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1
 MOZ_RAW=1
 MOZ_AUDIO_CHANNEL_MANAGER=1
 fi
 
 # use custom widget for html:select

--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -242,17 +242,16 @@ def old_configure_options(*options):
     '--enable-tree-freetype',
     '--enable-ui-locale',
     '--enable-universalchardet',
     '--enable-updater',
     '--enable-url-classifier',
     '--enable-valgrind',
     '--enable-verify-mar',
     '--enable-webrtc',
-    '--enable-webspeechtestbackend',
     '--enable-xul',
     '--enable-zipwriter',
     '--no-create',
     '--prefix',
     '--with-android-cxx-stl',
     '--with-android-distribution-directory',
     '--with-android-max-sdk',
     '--with-android-min-sdk',

--- a/old-configure.in
+++ b/old-configure.in
@@ -2330,17 +2330,16 @@ MOZ_SRTP=
 MOZ_WEBRTC_SIGNALING=
 MOZ_WEBRTC_ASSERT_ALWAYS=1
 MOZ_WEBRTC_HARDWARE_AEC_NS=
 MOZ_SCTP=
 MOZ_ANDROID_OMX=
 MOZ_OMX_PLUGIN=
 MOZ_VPX_ERROR_CONCEALMENT=
 MOZ_WEBSPEECH_MODELS=
-MOZ_WEBSPEECH_TEST_BACKEND=1
 VPX_USE_YASM=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PERMISSIONS=1
@@ -3001,34 +3000,16 @@ if test "$OS_TARGET" = "Android" -o "$CP
     AC_SUBST(MOZ_SAMPLE_TYPE_S16)
 else
     MOZ_SAMPLE_TYPE_FLOAT32=1
     AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
     AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
 fi
 
 dnl ========================================================
-dnl = Disable Speech API test backend
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(webspeechtestbackend,
-[  --disable-webspeechtestbackend        Disable support for HTML Speech API Test Backend],
-    MOZ_WEBSPEECH_TEST_BACKEND=,
-    MOZ_WEBSPEECH_TEST_BACKEND=1)
-
-if test -z "$MOZ_WEBSPEECH"; then
-MOZ_WEBSPEECH_TEST_BACKEND=
-fi
-
-if test -n "$MOZ_WEBSPEECH_TEST_BACKEND"; then
-    AC_DEFINE(MOZ_WEBSPEECH_TEST_BACKEND)
-fi
-
-AC_SUBST(MOZ_WEBSPEECH_TEST_BACKEND)
-
-dnl ========================================================
 dnl = Disable Speech API models
 dnl ========================================================
 if test -z "$MOZ_WEBSPEECH"; then
 MOZ_WEBSPEECH_MODELS=
 fi
 
 if test -n "$MOZ_WEBSPEECH_MODELS"; then
     AC_DEFINE(MOZ_WEBSPEECH_MODELS)

--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -540,18 +540,18 @@ option('--disable-synth-speechd', help='
 
 set_config('MOZ_SYNTH_SPEECHD',
            depends_if('--disable-synth-speechd')(lambda _: True))
 
 # Speech API
 # ==============================================================
 option('--disable-webspeech', help='Disable support for HTML Speech API')
 
-@depends('--disable-webspeech')
-def webspeech(value):
+@depends('--disable-webspeech', '--help')
+def webspeech(value, _):
     if value:
         return True
 
 set_config('MOZ_WEBSPEECH', webspeech)
 set_define('MOZ_WEBSPEECH', webspeech)
 add_old_configure_assignment('MOZ_WEBSPEECH', webspeech)
 
 # Speech API pocketsphinx backend
@@ -559,16 +559,28 @@ add_old_configure_assignment('MOZ_WEBSPE
 @depends(build_project, milestone, webspeech)
 def webspeech_pocketsphinx(build_project, milestone, webspeech):
     if webspeech and milestone.is_nightly and build_project == 'b2g':
         return True
 
 set_config('MOZ_WEBSPEECH_POCKETSPHINX', webspeech_pocketsphinx)
 set_define('MOZ_WEBSPEECH_POCKETSPHINX', webspeech_pocketsphinx)
 
+# Speech API test backend
+# ==============================================================
+option('--enable-webspeechtestbackend', default=webspeech,
+       help='Enable support for HTML Speech API Test Backend')
+
+@depends_if('--enable-webspeechtestbackend')
+def webspeech_test_backend(value):
+    return True
+
+set_config('MOZ_WEBSPEECH_TEST_BACKEND', webspeech_test_backend)
+set_define('MOZ_WEBSPEECH_TEST_BACKEND', webspeech_test_backend)
+
 # WebSMS
 # ==============================================================
 @depends(build_project, '--help')
 def websms_default(build_project, _):
     return build_project in ('b2g', 'b2g/graphene')
 
 option('--enable-websms-backend', default=websms_default,
        help='Enable WebSMS backend')