diff --git a/browser/config/mozconfigs/linux64/nightly-no-add-on-sign b/browser/config/mozconfigs/linux64/nightly-no-add-on-sign
new file mode 100644
index 000000000000..de679eb3227d
--- /dev/null
+++ b/browser/config/mozconfigs/linux64/nightly-no-add-on-sign
@@ -0,0 +1,4 @@
+# addon signing is checked but not required
+MOZ_REQUIRE_ADDON_SIGNING=0
+MOZ_ADDON_SIGNING=1
+. $topsrcdir/browser/config/mozconfigs/linux64/nightly
diff --git a/browser/confvars.sh b/browser/confvars.sh
index f9e37d10f865..7ca6345dd299 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -63,6 +63,3 @@ MOZ_PAY=1
 MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
 MOZ_WEBM_ENCODER=1
-
-# Enable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=1
diff --git a/build/mozconfig.common b/build/mozconfig.common
index 3b49b819ecfd..d6d603e7b52e 100644
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -16,4 +16,9 @@ ac_add_options --enable-crashreporter
 
 ac_add_options --enable-release
 
+# Enable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_ADDON_SIGNING=${MOZ_REQUIRE_ADDON_SIGNING-0}
+
 . "$topsrcdir/build/mozconfig.automation"
diff --git a/configure.in b/configure.in
index 1c9a6ebed87a..ab01e2705aac 100644
--- a/configure.in
+++ b/configure.in
@@ -3791,8 +3791,6 @@ MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
 MOZ_BINARY_EXTENSIONS=
-MOZ_ADDON_SIGNING=
-MOZ_REQUIRE_SIGNING=
 
 case "$target_os" in
     mingw*)
@@ -8609,8 +8607,12 @@ AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_LINKER_EXTRACT)
 
-AC_SUBST(MOZ_ADDON_SIGNING)
-AC_SUBST(MOZ_REQUIRE_SIGNING)
+if test "$MOZ_ADDON_SIGNING" = 1; then
+  AC_DEFINE(MOZ_ADDON_SIGNING)
+fi
+if test "$MOZ_REQUIRE_ADDON_SIGNING" = 1; then
+  AC_DEFINE(MOZ_REQUIRE_ADDON_SIGNING)
+fi
 
 if test -n "$MOZ_BINARY_EXTENSIONS"; then
   AC_DEFINE(MOZ_BINARY_EXTENSIONS)
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 8c3f0d6fa510..ed4f6797ca71 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -108,9 +108,6 @@ export JS_GC_SMALL_CHUNK_SIZE=1
 # Enable Firefox Account avatars.
 MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=1
 
-# Enable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=1
-
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index a52557b8682d..cfaf907addc0 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -8060,7 +8060,7 @@ Object.defineProperty(this, "REQUIRE_SIGNING", {
   configurable: false,
   enumerable: false,
   writable: false,
-#ifdef MOZ_REQUIRE_SIGNING
+#ifdef MOZ_REQUIRE_ADDON_SIGNING
   value: true,
 #else
   value: false,
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
index 7d1eaf296fbf..3ad37a2225f7 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -34,9 +34,3 @@ DEFINES['MOZ_EXTENSIONS_DB_SCHEMA'] = 17
 # Additional debugging info is exposed in debug builds
 if CONFIG['MOZ_EM_DEBUG']:
     DEFINES['MOZ_EM_DEBUG'] = 1
-
-if CONFIG['MOZ_ADDON_SIGNING']:
-    DEFINES['MOZ_ADDON_SIGNING'] = 1
-
-if CONFIG['MOZ_REQUIRE_SIGNING']:
-    DEFINES['MOZ_REQUIRE_SIGNING'] = 1