Index: /pyyaml/trunk/tests/test_yaml_ext.py
===================================================================
--- /pyyaml/trunk/tests/test_yaml_ext.py	(revision 223)
+++ /pyyaml/trunk/tests/test_yaml_ext.py	(revision 311)
@@ -29,8 +29,9 @@
             for token, ext_token in zip(tokens, ext_tokens):
                 self.failUnlessEqual(token.__class__, ext_token.__class__)
-                self.failUnlessEqual((token.start_mark.index, token.start_mark.line, token.start_mark.column),
-                        (ext_token.start_mark.index, ext_token.start_mark.line, ext_token.start_mark.column))
-                self.failUnlessEqual((token.end_mark.index, token.end_mark.line, token.end_mark.column),
-                        (ext_token.end_mark.index, ext_token.end_mark.line, ext_token.end_mark.column))
+                if not isinstance(token, yaml.StreamEndToken):
+                    self.failUnlessEqual((token.start_mark.index, token.start_mark.line, token.start_mark.column),
+                            (ext_token.start_mark.index, ext_token.start_mark.line, ext_token.start_mark.column))
+                    self.failUnlessEqual((token.end_mark.index, token.end_mark.line, token.end_mark.column),
+                            (ext_token.end_mark.index, ext_token.end_mark.line, ext_token.end_mark.column))
                 if hasattr(token, 'value'):
                     self.failUnlessEqual(token.value, ext_token.value)
Index: /pyyaml/trunk/tests/test_build.py
===================================================================
--- /pyyaml/trunk/tests/test_build.py	(revision 39)
+++ /pyyaml/trunk/tests/test_build.py	(revision 311)
@@ -2,7 +2,8 @@
 def main():
     import sys, os, distutils.util
-    #build_lib = os.path.join('build', 'lib.%s-%s' % (distutils.util.get_platform(), sys.version[0:3]))
     build_lib = 'build/lib'
+    build_lib_ext = os.path.join('build', 'lib.%s-%s' % (distutils.util.get_platform(), sys.version[0:3]))
     sys.path.insert(0, build_lib)
+    sys.path.insert(0, build_lib_ext)
     import test_yaml
     test_yaml.main('test_yaml')