diff --git a/test/Twig/Tests/TokenStreamTest.php b/test/Twig/Tests/TokenStreamTest.php
index 4edb8c31d..fd4ec6337 100644
--- a/test/Twig/Tests/TokenStreamTest.php
+++ b/test/Twig/Tests/TokenStreamTest.php
@@ -38,4 +38,33 @@ class Twig_Tests_TokenStreamTest extends PHPUnit_Framework_TestCase
         }
         $this->assertEquals('1, 2, 3, 4, 5, 6, 7', implode(', ', $repr), '->next() advances the pointer and returns the current token');
     }
+
+    /**
+     * @expectedException Twig_Error_Syntax
+     * @expectedMessage   Unexpected end of template
+     */
+    public function testEndOfTemplateNext()
+    {
+        $stream = new Twig_TokenStream(array(
+            new Twig_Token(Twig_Token::BLOCK_START_TYPE, 1, 1),
+        ));
+        while (!$stream->isEOF()) {
+            $stream->next();
+        }
+    }
+
+    /**
+     * @expectedException Twig_Error_Syntax
+     * @expectedMessage   Unexpected end of template
+     */
+    public function testEndOfTemplateLook()
+    {
+        $stream = new Twig_TokenStream(array(
+            new Twig_Token(Twig_Token::BLOCK_START_TYPE, 1, 1),
+        ));
+        while (!$stream->isEOF()) {
+            $stream->look();
+            $stream->next();
+        }
+    }
 }