diff --git a/configure.in b/configure.in
index 29cd9cf67280..624e57c1c44d 100644
--- a/configure.in
+++ b/configure.in
@@ -5230,7 +5230,6 @@ dnl enable once PeerConnection lands
 fi
 
 AC_SUBST(MOZ_WEBRTC)
-AC_SUBST(MOZ_WEBRTC_TESTS)
 AC_SUBST(MOZ_WEBRTC_SIGNALING)
 AC_SUBST(MOZ_PEERCONNECTION)
 AC_SUBST(MOZ_WEBRTC_IN_LIBXUL)
diff --git a/media/mtransport/test/mtransport_test_utils.h b/media/mtransport/test/mtransport_test_utils.h
index 82112b30832a..249e53987228 100644
--- a/media/mtransport/test/mtransport_test_utils.h
+++ b/media/mtransport/test/mtransport_test_utils.h
@@ -91,6 +91,13 @@ MtransportTestUtils *mtransport_test_utils;
 #define SETUP_MTRANSPORT_TEST_UTILS() \
   MtransportTestUtils utils_; mtransport_test_utils = &utils_
 
+#define CHECK_ENVIRONMENT_FLAG(envname) \
+  char *test_flag = getenv(envname); \
+  if (!test_flag || strcmp(test_flag, "1")) { \
+    printf("To run this test set %s=1 in your environment\n", envname); \
+    exit(0); \
+  } \
+
 
 #endif
 
diff --git a/media/webrtc/signaling/test/mediaconduit_unittests.cpp b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
index 63e064b3f1db..87e2d17e94a7 100644
--- a/media/webrtc/signaling/test/mediaconduit_unittests.cpp
+++ b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
@@ -749,6 +749,9 @@ TEST_F(TransportConduitTest, TestVideoConduitCodecAPI) {
 
 int main(int argc, char **argv)
 {
+  // This test can cause intermittent oranges on the builders
+  CHECK_ENVIRONMENT_FLAG("MOZ_WEBRTC_TESTS")
+
   test_utils = new MtransportTestUtils();
   ::testing::InitGoogleTest(&argc, argv);
   int rv = RUN_ALL_TESTS();
diff --git a/media/webrtc/signaling/test/signaling_unittests.cpp b/media/webrtc/signaling/test/signaling_unittests.cpp
index 0105c0c316fb..3b87aafa6fec 100644
--- a/media/webrtc/signaling/test/signaling_unittests.cpp
+++ b/media/webrtc/signaling/test/signaling_unittests.cpp
@@ -1203,6 +1203,9 @@ TEST_F(SignalingTest, FullCallTrickle)
 } // End namespace test.
 
 int main(int argc, char **argv) {
+  // This test can cause intermittent oranges on the builders
+  CHECK_ENVIRONMENT_FLAG("MOZ_WEBRTC_TESTS")
+
   test_utils = new MtransportTestUtils();
   NSS_NoDB_Init(NULL);
   NSS_SetDomesticPolicy();
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index 4b16d2380c1c..e1722b95d4af 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -301,9 +301,7 @@ tier_platform_dirs += testing/tools/screenshot
 tier_platform_dirs += testing/peptest
 tier_platform_dirs += testing/mozbase
 ifdef MOZ_WEBRTC
-ifdef MOZ_WEBRTC_TESTS
 tier_platform_dirs += media/webrtc/signaling/test
 tier_platform_dirs += media/mtransport/test
 endif
 endif
-endif