diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index f378f3741f4..793efb60572 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -68,8 +68,6 @@ MOCHITEST_FILES = \
 		test_audio1.html \
 		test_audio2.html \
 		test_autoplay.html \
-		test_bug465498.html \
-		test_bug493187.html \
 		test_bug495145.html \
 		test_bug495300.html \
 		test_bug654550.html \
@@ -184,6 +182,12 @@ endif
 # Disabled since we don't play Wave files standalone, for now
 #		test_audioDocumentTitle.html
 
+# The below tests are disabled due to frequent timeouts.
+# Bug 832768 and Bug 864682:
+#		test_bug465498.html
+# Bug 707777:
+#		test_bug493187.html
+
 # sample files
 MOCHITEST_FILES += \
 		320x240.ogv \