diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index 605a36c6fed..d1bc10feb52 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -120,6 +120,8 @@ _TEST_FILES += \
 		bug498855-2.ogv \
 		bug498855-3.ogv \
 		bug499519.ogv \
+		bug500311.ogv \
+		bug500311.ogv^headers^ \
 		seek.ogv \
 		small-shot.ogg \
 		sound.ogg \
diff --git a/content/media/test/bug500311.ogv b/content/media/test/bug500311.ogv
new file mode 100644
index 00000000000..2cf27ef1ee0
Binary files /dev/null and b/content/media/test/bug500311.ogv differ
diff --git a/content/media/test/bug500311.ogv^headers^ b/content/media/test/bug500311.ogv^headers^
new file mode 100644
index 00000000000..9aa9dea8819
--- /dev/null
+++ b/content/media/test/bug500311.ogv^headers^
@@ -0,0 +1,2 @@
+X-Content-Duration: 1.96
+
diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js
index 73d375b9316..f4e288deb05 100644
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -27,6 +27,8 @@ var gPlayTests = [
   { name:"bug461281.ogg", type:"application/ogg" },
   // oggz-chop stream
   { name:"bug482461.ogv", type:"video/ogg", duration:4.24 },
+  // With first frame a "duplicate" (empty) frame.
+  { name:"bug500311.ogv", type:"video/ogg", duration:1.96 },
   // Small audio file
   { name:"small-shot.ogg", type:"video/ogg" },