diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
index 66a648e386..32180f17e8 100644
--- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
@@ -19,6 +19,9 @@ class @HTMLEditingDescriptor
 #   This is a workaround for the fact that tinyMCE's baseURL property is not getting correctly set on AWS
 #   instances (like sandbox). It is not necessary to explicitly set baseURL when running locally.
     tinyMCE.baseURL = "#{baseUrl}/js/vendor/tiny_mce"
+#   This is necessary for the LMS bulk e-mail acceptance test. In that particular scenario,
+#   tinyMCE incorrectly decides that the suffix should be "", which means it fails to load files.
+    tinyMCE.suffix = ".min"
     @tiny_mce_textarea = $(".tiny-mce", @element).tinymce({
       script_url : "#{baseUrl}/js/vendor/tiny_mce/tiny_mce.min.js",
       theme : "modern",
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index 0552c7c82d..8191b8c3ec 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -37,8 +37,8 @@
   <link rel="stylesheet" href="${static.url('css/vendor/slickgrid/smoothness/jquery-ui-1.8.16.custom.css')}">
   <link rel="stylesheet" href="${static.url('css/vendor/slickgrid/slick.grid.css')}">
   <script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/tiny_mce/tiny_mce.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/tiny_mce/jquery.tinymce.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/tiny_mce/tinymce.min.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/tiny_mce/jquery.tinymce.min.js')}"></script>
   <%static:js group='module-descriptor-js'/>
   <%static:js group='instructor_dash'/>
 </%block>