diff -r 000000000000 -r 6474c204b198 toolkit/mozapps/update/tests/marionette/update_test_status.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/mozapps/update/tests/marionette/update_test_status.py	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,29 @@
+from b2g_update_test import B2GUpdateTestCase, OTA, FOTA
+import os
+
+this_dir = os.path.abspath(os.path.dirname(__file__))
+update_test_dir = os.path.dirname(this_dir)
+
+class UpdateTestStatus(B2GUpdateTestCase):
+    B2G_UPDATES = "/data/local/b2g-updates"
+
+    def setUp(self):
+        # Stage a phony update to get the http server up and running
+        mar_path = os.path.join(update_test_dir, "unit", "data", "simple.mar")
+        self.stage_update(complete_mar=mar_path)
+
+        bad_xml = os.path.join(this_dir, "data", "bad.xml")
+        err_cgi = os.path.join(this_dir, "data", "err.cgi")
+        self.runner.adb.push(bad_xml, self.B2G_UPDATES + "/bad.xml")
+        self.runner.adb.shell("mkdir " + self.B2G_UPDATES + "/cgi-bin")
+        self.runner.adb.push(err_cgi, self.B2G_UPDATES + "/cgi-bin/err.cgi")
+        self.runner.adb.shell("chmod 755 " + self.B2G_UPDATES + "/cgi-bin/err.cgi")
+
+        B2GUpdateTestCase.setUp(self)
+
+    def test_status(self):
+        self.marionette.set_script_timeout(30 * 1000)
+        status_js = os.path.join(os.path.dirname(__file__),
+                                 "update_test_status.js")
+        self.execute_update_test(status_js)
+