--- a/testing/taskcluster/tasks/b2g_e2e_tests_base_definition.yml
+++ b/testing/taskcluster/tasks/b2g_e2e_tests_base_definition.yml
@@ -40,16 +40,21 @@ task:
         path: '/home/worker/data/device.json'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
       'private/b2g/logs':
         type: directory
         path: '/home/worker/upload/logs/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
+      'private/b2g/videos':
+        type: directory
+        path: '/home/worker/upload/videos/'
+        expires: '{{#from_now}}3 months{{/from_now}}'
+
     features:
       testdroidProxy: true
 
     capabilities:
       devices:
         phone:
           type: 'flame'
           memory: '512'
@@ -76,16 +81,18 @@ task:
         --adb-host=$PROXY_HOST
         --adb-port=$ADB_PORT
         --address=$PROXY_HOST:$MARIONETTE_PORT
         --device $SERIAL_ID
         --xml-output=/home/worker/upload/logs/xml_output.xml
         --log-html=/home/worker/upload/logs/index.html
         --log-mach=-
         --log-raw=/home/worker/upload/logs/raw.log
+        --capture=whenfail
+        --capturefolder=/home/worker/upload/videos/
         --restart
         --timeout=$TESTS_TIMEOUT_IN_MS
         --type=$MANIFEST_INCLUDE_EXCLUDE
         $MANIFEST_PATH
 
   extra:
     treeherder:
       groupName: B2G end-to-end tests (Python)