diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee
index 8d251cc1f8..13c7614483 100644
--- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee
+++ b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee
@@ -99,7 +99,7 @@ class @VideoPlayerAlpha extends SubviewAlpha
     @video.log 'load_video'
     if @video.videoType is 'html5'
       @player.setPlaybackRate @video.speed
-    unless onTouchBasedDevice()
+    if not onTouchBasedDevice() and $('.video:first').data('autoplay') is 'True'
       $('.video-load-complete:first').data('video').player.play()
 
   onStateChange: (event) =>
diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py
index 92cd176af7..43de021799 100644
--- a/common/lib/xmodule/xmodule/videoalpha_module.py
+++ b/common/lib/xmodule/xmodule/videoalpha_module.py
@@ -5,6 +5,7 @@ from lxml import etree
 from pkg_resources import resource_string, resource_listdir
 
 from django.http import Http404
+from django.conf import settings
 
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
@@ -147,7 +148,8 @@ class VideoAlphaModule(VideoAlphaFields, XModule):
             'caption_asset_path': caption_asset_path,
             'show_captions': self.show_captions,
             'start': self.start_time,
-            'end': self.end_time
+            'end': self.end_time,
+            'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True)
         })
 
 
diff --git a/lms/djangoapps/courseware/features/videoalpha.feature b/lms/djangoapps/courseware/features/videoalpha.feature
new file mode 100644
index 0000000000..2a0acb0f9b
--- /dev/null
+++ b/lms/djangoapps/courseware/features/videoalpha.feature
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000..cabf8c681f
--- /dev/null
+++ b/lms/djangoapps/courseware/features/videoalpha.py
@@ -0,0 +1,36 @@
+#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/videoalpha.html b/lms/templates/videoalpha.html
index 2028d3c320..07c7dbee27 100644
--- a/lms/templates/videoalpha.html
+++ b/lms/templates/videoalpha.html
@@ -18,6 +18,7 @@
       data-start="${start}"
       data-end="${end}"
       data-caption-asset-path="${caption_asset_path}"
+      data-autoplay="${autoplay}"
   >
     <div class="tc-wrapper">
       <article class="video-wrapper">