Index: pyyaml/trunk/tests/test_all.py
===================================================================
--- pyyaml/trunk/tests/test_all.py	(revision 291)
+++ pyyaml/trunk/tests/test_all.py	(revision 322)
@@ -1,13 +1,13 @@
 
-import unittest
+import sys, yaml, test_appliance
 
-def main():
-    import yaml
-    names = ['test_yaml']
-    if yaml.__libyaml__:
-        names.append('test_yaml_ext')
-    suite = unittest.defaultTestLoader.loadTestsFromNames(names)
-    runner = unittest.TextTestRunner()
-    runner.run(suite)
+def main(args=None):
+    collections = []
+    import test_yaml
+    collections.append(test_yaml)
+    if yaml.__with_libyaml__:
+        import test_yaml_ext
+        collections.append(test_yaml_ext)
+    test_appliance.run(collections, args)
 
 if __name__ == '__main__':