diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py
index 26a8adc92c..1e7a32dc68 100644
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -36,3 +36,4 @@ DATABASES = {
 INSTALLED_APPS += ('lettuce.django',)
 LETTUCE_APPS = ('contentstore',)
 LETTUCE_SERVER_PORT = 8001
+LETTUCE_BROWSER = 'chrome'
diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py
index c8cc0c9e4b..1d371a3242 100644
--- a/common/djangoapps/terrain/browser.py
+++ b/common/djangoapps/terrain/browser.py
@@ -1,6 +1,8 @@
 from lettuce import before, after, world
 from splinter.browser import Browser
 from logging import getLogger
+from django.core.management import call_command
+from django.conf import settings
 
 # Let the LMS and CMS do their one-time setup
 # For example, setting up mongo caches
@@ -10,18 +12,14 @@ from cms import one_time_startup
 logger = getLogger(__name__)
 logger.info("Loading the lettuce acceptance testing terrain file...")
 
-from django.core.management import call_command
-
 
 @before.harvest
 def initial_setup(server):
     '''
     Launch the browser once before executing the tests
     '''
-    # Launch the browser app (choose one of these below)
-    world.browser = Browser('chrome')
-    # world.browser = Browser('phantomjs')
-    # world.browser = Browser('firefox')
+    browser_driver = getattr(settings, 'LETTUCE_BROWSER', 'chrome')
+    world.browser = Browser(browser_driver)
 
 
 @before.each_scenario
@@ -34,6 +32,15 @@ def reset_data(scenario):
     call_command('flush', interactive=False)
 
 
+@after.each_scenario
+def screenshot_on_error(scenario):
+    '''
+    Save a screenshot to help with debugging
+    '''
+    if scenario.failed:
+        world.browser.driver.save_screenshot('/tmp/last_failed_scenario.png')
+
+
 @after.all
 def teardown_browser(total):
     '''
diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py
index 5f416cd189..2c51dda5e6 100644
--- a/lms/envs/acceptance.py
+++ b/lms/envs/acceptance.py
@@ -67,3 +67,4 @@ MITX_FEATURES['STUB_VIDEO_FOR_TESTING'] = True
 # Include the lettuce app for acceptance testing, including the 'harvest' django-admin command
 INSTALLED_APPS += ('lettuce.django',)
 LETTUCE_APPS = ('courseware',)
+LETTUCE_BROWSER = 'chrome'