Index: branches/pyyaml3000/tests/test_errors.py
===================================================================
--- branches/pyyaml3000/tests/test_errors.py	(revision 47)
+++ branches/pyyaml3000/tests/test_errors.py	(revision 51)
@@ -19,12 +19,10 @@
         reader = Reader(file(filename, 'rb'))
         scanner = Scanner(reader)
-        while scanner.peek_token():
-            scanner.get_token()
+        return list(scanner)
 
     def _load_string(self, filename):
         reader = Reader(file(filename, 'rb').read())
         scanner = Scanner(reader)
-        while scanner.peek_token():
-            scanner.get_token()
+        return list(scanner)
 
 TestErrors.add_tests('testErrors', '.error-message')