diff --git a/test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test b/test/Twig/Tests/Fixtures/functions/undefined_block.test
similarity index 71%
rename from test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test
rename to test/Twig/Tests/Fixtures/functions/undefined_block.test
index 62e24f0f4..1470e903b 100644
--- a/test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test
+++ b/test/Twig/Tests/Fixtures/functions/undefined_block.test
@@ -8,5 +8,5 @@
 {% block bar %}Bar{% endblock %}
 --DATA--
 return array()
---EXPECT--
-FooBarBar
+--EXCEPTION--
+Twig_Error_Runtime: Block "unknown" on template "base.twig" does not exist in "base.twig" at line 2.
diff --git a/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test b/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test
deleted file mode 100644
index b091ad34d..000000000
--- a/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"filename" autoescape strategy
---TEMPLATE--
-{{ br -}}
-{{ include('index.html.twig') -}}
-{{ include('index.txt.twig') -}}
---TEMPLATE(index.html.twig)--
-{{ br -}}
---TEMPLATE(index.txt.twig)--
-{{ br -}}
---DATA--
-return array('br' => '<br />')
---CONFIG--
-return array('autoescape' => 'filename')
---EXPECT--
-&lt;br /&gt;
-&lt;br /&gt;
-<br />