diff --git a/filter/mediaplugin/tests/filter_test.php b/filter/mediaplugin/tests/filter_test.php
index d981582b0e1..322908584a1 100644
--- a/filter/mediaplugin/tests/filter_test.php
+++ b/filter/mediaplugin/tests/filter_test.php
@@ -52,7 +52,7 @@ class filter_mediaplugin_testcase extends advanced_testcase {
         $validtexts = array (
             '<a href="http://moodle.org/testfile/test.mp3">test mp3</a>',
             '<a href="http://moodle.org/testfile/test.ogg">test ogg</a>',
-            '<a id="movie player" class="center" href="http://moodle.org/testfile/test.mpg">test mpg</a>',
+            '<a id="movie player" class="center" href="http://moodle.org/testfile/test.mp4">test mp4</a>',
             '<a href="http://moodle.org/testfile/test.webm">test</a>',
             '<a href="http://www.youtube.com/watch?v=JghQgA2HMX8" class="href=css">test file</a>',
             '<a href="http://www.youtube-nocookie.com/watch?v=JghQgA2HMX8" class="href=css">test file</a>',
diff --git a/media/player/videojs/settings.php b/media/player/videojs/settings.php
index 33de4d6037c..a1b28369d75 100644
--- a/media/player/videojs/settings.php
+++ b/media/player/videojs/settings.php
@@ -29,7 +29,7 @@ if ($ADMIN->fulltree) {
     $settings->add(new admin_setting_configtext('media_videojs/videoextensions',
         new lang_string('videoextensions', 'media_videojs'),
         new lang_string('configvideoextensions', 'media_videojs'),
-        '.mov, .mp4, .m4v, .mpeg, .mpe, .mpg, .ogv, .webm, .flv, .f4v'));
+        '.mov, .mp4, .m4v, .ogv, .webm, .flv, .f4v'));
 
     $settings->add(new admin_setting_configtext('media_videojs/audioextensions',
         new lang_string('audioextensions', 'media_videojs'),