diff -r 000000000000 -r 6474c204b198 testing/mozbase/manifestdestiny/tests/test_testmanifest.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testing/mozbase/manifestdestiny/tests/test_testmanifest.py	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+import os
+import unittest
+from manifestparser import TestManifest
+
+here = os.path.dirname(os.path.abspath(__file__))
+
+class TestTestManifest(unittest.TestCase):
+    """Test the Test Manifest"""
+
+    def test_testmanifest(self):
+        # Test filtering based on platform:
+        filter_example = os.path.join(here, 'filter-example.ini')
+        manifest = TestManifest(manifests=(filter_example,))
+        self.assertEqual([i['name'] for i in manifest.active_tests(os='win', disabled=False, exists=False)],
+                         ['windowstest', 'fleem'])
+        self.assertEqual([i['name'] for i in manifest.active_tests(os='linux', disabled=False, exists=False)],
+                         ['fleem', 'linuxtest'])
+
+        # Look for existing tests.  There is only one:
+        self.assertEqual([i['name'] for i in manifest.active_tests()],
+                         ['fleem'])
+
+        # You should be able to expect failures:
+        last_test = manifest.active_tests(exists=False, toolkit='gtk2')[-1]
+        self.assertEqual(last_test['name'], 'linuxtest')
+        self.assertEqual(last_test['expected'], 'pass')
+        last_test = manifest.active_tests(exists=False, toolkit='cocoa')[-1]
+        self.assertEqual(last_test['expected'], 'fail')
+
+    def test_comments(self):
+        """
+        ensure comments work, see
+        https://bugzilla.mozilla.org/show_bug.cgi?id=813674
+        """
+        comment_example = os.path.join(here, 'comment-example.ini')
+        manifest = TestManifest(manifests=(comment_example,))
+        self.assertEqual(len(manifest.tests), 8)
+        names = [i['name'] for i in manifest.tests]
+        self.assertFalse('test_0202_app_launch_apply_update_dirlocked.js' in names)
+
+
+if __name__ == '__main__':
+    unittest.main()