diff --git a/lms/djangoapps/courseware/features/video.feature b/lms/djangoapps/courseware/features/video.feature
index c4d96f93f7..2b8d0f013a 100644
--- a/lms/djangoapps/courseware/features/video.feature
+++ b/lms/djangoapps/courseware/features/video.feature
@@ -1,6 +1,10 @@
 Feature: Video component
   As a student, I want to view course videos in LMS.
 
-  Scenario: Autoplay is enabled in LMS
-    Given the course has a Video component
-    Then when I view the video it has autoplay enabled
+  Scenario: Autoplay is enabled in LMS for a Video component
+  Given the course has a Video component
+  Then when I view the video it has autoplay enabled
+
+  Scenario: Autoplay is enabled in the LMS for a VideoAlpha component
+  Given the course has a VideoAlpha component
+  Then when I view the video it has autoplay enabled
diff --git a/lms/djangoapps/courseware/features/video.py b/lms/djangoapps/courseware/features/video.py
index 8cef5564f3..cd1bdcf60f 100644
--- a/lms/djangoapps/courseware/features/video.py
+++ b/lms/djangoapps/courseware/features/video.py
@@ -27,8 +27,30 @@ def view_video(_step):
     world.browser.visit(url)
 
 
+@step('the course has a VideoAlpha component')
+def view_videoalpha(step):
+    coursename = TEST_COURSE_NAME.replace(' ', '_')
+    i_am_registered_for_the_course(step, coursename)
+
+    # Make sure we have a videoalpha
+    add_videoalpha_to_course(coursename)
+    chapter_name = TEST_SECTION_NAME.replace(" ", "_")
+    section_name = chapter_name
+    url = django_url('/courses/edx/Test_Course/Test_Course/courseware/%s/%s' %
+                     (chapter_name, section_name))
+
+    world.browser.visit(url)
+
+
 def add_video_to_course(course):
     template_name = 'i4x://edx/templates/video/default'
     world.ItemFactory.create(parent_location=section_location(course),
                              template=template_name,
                              display_name='Video')
+
+
+def add_videoalpha_to_course(course):
+    template_name = 'i4x://edx/templates/videoalpha/Video_Alpha'
+    world.ItemFactory.create(parent_location=section_location(course),
+                             template=template_name,
+                             display_name='Video Alpha')
diff --git a/lms/djangoapps/courseware/features/videoalpha.feature b/lms/djangoapps/courseware/features/videoalpha.feature
deleted file mode 100644
index 2a0acb0f9b..0000000000
--- a/lms/djangoapps/courseware/features/videoalpha.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Video Alpha component
-  As a student, I want to view course videos in LMS.
-
-  Scenario: Autoplay is enabled in LMS
-    Given the course has a Video component
-    Then when I view the video it has autoplay enabled
diff --git a/lms/djangoapps/courseware/features/videoalpha.py b/lms/djangoapps/courseware/features/videoalpha.py
deleted file mode 100644
index cabf8c681f..0000000000
--- a/lms/djangoapps/courseware/features/videoalpha.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#pylint: disable=C0111
-#pylint: disable=W0613
-#pylint: disable=W0621
-
-from lettuce import world, step
-from lettuce.django import django_url
-from common import TEST_COURSE_NAME, TEST_SECTION_NAME, i_am_registered_for_the_course, section_location
-
-############### ACTIONS ####################
-
-
-@step('when I view the video it has autoplay enabled')
-def does_autoplay(step):
-    assert(world.css_find('.videoalpha')[0]['data-autoplay'] == 'True')
-
-
-@step('the course has a Video component')
-def view_videoalpha(step):
-    coursename = TEST_COURSE_NAME.replace(' ', '_')
-    i_am_registered_for_the_course(step, coursename)
-
-    # Make sure we have a videoalpha
-    add_videoalpha_to_course(coursename)
-    chapter_name = TEST_SECTION_NAME.replace(" ", "_")
-    section_name = chapter_name
-    url = django_url('/courses/edx/Test_Course/Test_Course/courseware/%s/%s' %
-                     (chapter_name, section_name))
-
-    world.browser.visit(url)
-
-
-def add_videoalpha_to_course(course):
-    template_name = 'i4x://edx/templates/videoalpha/default'
-    world.ItemFactory.create(parent_location=section_location(course),
-                             template=template_name,
-                             display_name='Video Alpha 1')
diff --git a/lms/templates/video.html b/lms/templates/video.html
index 267372176a..91b5f63b81 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -2,37 +2,33 @@
   <h2> ${display_name} </h2>
 % endif
 
-%if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
-  <div id="stub_out_video_for_testing">
-    <div class="video" data-autoplay="${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}">
-      <section class="video-controls">
-	<div class="slider"></div>
-	<div>
-	  <ul class="vcr">
-            <li><a class="video_control" href="#"></a></li>
-            <li>
-              <div class="vidtime">0:00 / 0:00</div>
-            </li>
-	  </ul>
-	  <div class="secondary-controls">
-            <a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a>
-	  </div>
-	</div>
-      </section>
-    </div>
-  </div>
-%elif settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and normal_speed_video_id:
+%if settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and normal_speed_video_id:
   <object width="640" height="390">
     <param name="movie"
-           value="https://www.youtube.com/v/${normal_speed_video_id}?version=3&amp;autoplay=1&amp;rel=0"></param>
+    % if not settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
+    value="https://www.youtube.com/v/${normal_speed_video_id}?version=3&amp;autoplay=1&amp;rel=0">
+    % endif
+    </param>
     <param name="allowScriptAccess" value="always"></param>
-    <embed src="https://www.youtube.com/v/${normal_speed_video_id}?version=3&amp;autoplay=1&amp;rel=0"
-           type="application/x-shockwave-flash"
-           allowscriptaccess="always"
-           width="640" height="390"></embed>
+    <embed 
+       % if not settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
+       src="https://www.youtube.com/v/${normal_speed_video_id}?version=3&amp;autoplay=1&amp;rel=0"
+       % endif
+       type="application/x-shockwave-flash"
+       allowscriptaccess="always"
+       width="640" height="390"></embed>
   </object>
 %else:
-  <div id="video_${id}" class="video" data-streams="${streams}" data-show-captions="${show_captions}" data-start="${start}" data-end="${end}" data-caption-asset-path="${caption_asset_path}" data-autoplay="${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}">
+<div id="video_${id}" class="video" 
+
+    % if not settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
+    data-streams="${streams}" 
+    % endif
+
+    data-show-captions="${show_captions}" 
+    data-start="${start}" data-end="${end}" 
+    data-caption-asset-path="${caption_asset_path}" 
+    data-autoplay="${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}">
     <div class="tc-wrapper">
       <article class="video-wrapper">
         <section class="video-player">
diff --git a/lms/templates/videoalpha.html b/lms/templates/videoalpha.html
index 07c7dbee27..2bb5d817a8 100644
--- a/lms/templates/videoalpha.html
+++ b/lms/templates/videoalpha.html
@@ -2,34 +2,38 @@
   <h2> ${display_name} </h2>
 % endif
 
-%if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
-  <div id="stub_out_video_for_testing"></div>
-%else:
-  <div
-      id="video_${id}"
-      class="video"
-      data-streams="${youtube_streams}"
-      ${'data-sub="{}"'.format(sub) if sub else ''}
-      ${'data-mp4-source="{}"'.format(sources.get('mp4')) if sources.get('mp4') else ''}
-      ${'data-webm-source="{}"'.format(sources.get('webm')) if sources.get('webm') else ''}
-      ${'data-ogg-source="{}"'.format(sources.get('ogv')) if sources.get('ogv') else ''}
-      data-caption-data-dir="${data_dir}"
-      data-show-captions="${show_captions}"
-      data-start="${start}"
-      data-end="${end}"
-      data-caption-asset-path="${caption_asset_path}"
-      data-autoplay="${autoplay}"
-  >
-    <div class="tc-wrapper">
-      <article class="video-wrapper">
-        <section class="video-player">
-          <div id="${id}"></div>
-        </section>
-        <section class="video-controls"></section>
-      </article>
-    </div>
-  </div>
-%endif
+<div
+  id="video_${id}"
+  class="video"
+  
+  % if not settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
+  data-streams="${youtube_streams}"
+  % endif
+
+  ${'data-sub="{}"'.format(sub) if sub else ''}
+
+  % if not settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
+  ${'data-mp4-source="{}"'.format(sources.get('mp4')) if sources.get('mp4') else ''}
+  ${'data-webm-source="{}"'.format(sources.get('webm')) if sources.get('webm') else ''}
+  ${'data-ogg-source="{}"'.format(sources.get('ogv')) if sources.get('ogv') else ''}
+  % endif
+
+  data-caption-data-dir="${data_dir}"
+  data-show-captions="${show_captions}"
+  data-start="${start}"
+  data-end="${end}"
+  data-caption-asset-path="${caption_asset_path}"
+  data-autoplay="${autoplay}"
+>
+<div class="tc-wrapper">
+  <article class="video-wrapper">
+    <section class="video-player">
+      <div id="${id}"></div>
+    </section>
+    <section class="video-controls"></section>
+  </article>
+</div>
+</div>
 
 % if sources.get('main'):
 <div class="video-sources">