diff --git a/tests/common/contentType.compatibility.phpt b/tests/common/contentType.compatibility.phpt
index 9162f68975..3e9f12bfa0 100644
--- a/tests/common/contentType.compatibility.phpt
+++ b/tests/common/contentType.compatibility.phpt
@@ -293,7 +293,7 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 	'context1a' => '<p>{block html|noescape}<hr> " &lt;{/block}</p>',
 	'context1b' => '<p>{block html|upper}<hr> " &lt;{/block}</p>',
 	'context1c' => '<p>{block html|stripHtml|upper}<hr> " &lt;{/block}</p>',
-	'context2' => '<p title="{block html}<hr> &quot;{/block}"</p>',
+	'context2' => '<p title="{block html}<hr> &quot;{/block}"></p>',
 	'context2a' => '<p title="{block html|stripHtml|upper}<hr> &quot;{/block}"></p>',
 	'context6' => '<!--{block html}<hr> &lt;{/block}-->',
 	'context6a' => '<!--{block html|stripHtml|upper}<hr> &lt;{/block}-->',
@@ -310,7 +310,7 @@ Assert::exception(function () use ($latte) {
 }, Latte\RuntimeException::class, 'Filter |upper is called with incompatible content type HTML, try to prepend |stripHtml.');
 
 Assert::same('<p> " &lt;</p>', $latte->renderToString('context1c'));
-Assert::same('<p title="&lt;hr&gt; &quot;"</p>', $latte->renderToString('context2'));
+Assert::same('<p title="&lt;hr&gt; &quot;"></p>', $latte->renderToString('context2'));
 Assert::same('<p title=" &quot;"></p>', $latte->renderToString('context2a'));
 Assert::same('<!--<hr> &lt;-->', $latte->renderToString('context6'));
 
@@ -326,7 +326,7 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 	'context1a' => '<p>{var $n=html}{block $n|noescape}<hr> " &lt;{/block}</p>',
 	'context1b' => '<p>{var $n=html}{block $n|upper}<hr> " &lt;{/block}</p>',
 	'context1c' => '<p>{var $n=html}{block $n|stripHtml|upper}<hr> " &lt;{/block}</p>',
-	'context2' => '<p title="{var $n=html}{block $n}<hr> &quot;{/block}"</p>',
+	'context2' => '<p title="{var $n=html}{block $n}<hr> &quot;{/block}"></p>',
 	'context2a' => '<p title="{var $n=html}{block $n|stripHtml|upper}<hr> &quot;{/block}"></p>',
 	'context6' => '<!--{var $n=html}{block $n}<hr> &lt;{/block}-->',
 	'context6a' => '<!--{var $n=html}{block $n|stripHtml|upper}<hr> &lt;{/block}-->',
@@ -343,7 +343,7 @@ Assert::exception(function () use ($latte) {
 }, Latte\RuntimeException::class, 'Filter |upper is called with incompatible content type HTML, try to prepend |stripHtml.');
 
 Assert::same('<p> " &lt;</p>', $latte->renderToString('context1c'));
-Assert::same('<p title="&lt;hr&gt; &quot;"</p>', $latte->renderToString('context2'));
+Assert::same('<p title="&lt;hr&gt; &quot;"></p>', $latte->renderToString('context2'));
 Assert::same('<p title=" &quot;"></p>', $latte->renderToString('context2a'));
 Assert::same('<!--<hr> &lt;-->', $latte->renderToString('context6'));
 
@@ -359,7 +359,7 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 	'context1a' => '<p>{block|noescape}<hr> " &lt;{/block}</p>',
 	'context1b' => '<p>{block|upper}<hr> " &lt;{/block}</p>',
 	'context1c' => '<p>{block|stripHtml|upper}<hr> " &lt;{/block}</p>',
-	'context2' => '<p title="{block}<hr> &quot;{/block}"</p>',
+	'context2' => '<p title="{block}<hr> &quot;{/block}"></p>',
 	'context2a' => '<p title="{block|stripHtml|upper}<hr> &quot;{/block}"></p>',
 	'context6' => '<!--{block}<hr> &lt;{/block}-->',
 	'context6a' => '<!--{block|stripHtml|upper}<hr> &lt;{/block}-->',
@@ -376,7 +376,7 @@ Assert::exception(function () use ($latte) {
 }, Latte\RuntimeException::class, 'Filter |upper is called with incompatible content type HTML, try to prepend |stripHtml.');
 
 Assert::same('<p> " &lt;</p>', $latte->renderToString('context1c'));
-Assert::same('<p title="<hr> &quot;"</p>', $latte->renderToString('context2'));
+Assert::same('<p title="<hr> &quot;"></p>', $latte->renderToString('context2'));
 Assert::same('<p title=" &quot;"></p>', $latte->renderToString('context2a'));
 Assert::same('<!--<hr> &lt;-->', $latte->renderToString('context6'));
 
diff --git a/tests/tags/contentType.phpt b/tests/tags/contentType.phpt
index ea1ee1e979..9d47f07cf9 100644
--- a/tests/tags/contentType.phpt
+++ b/tests/tags/contentType.phpt
@@ -26,6 +26,21 @@ Assert::exception(function () use ($latte) {
 	$latte->createTemplate('<div>{contentType xml}</div>');
 }, Latte\CompileException::class, '{contentType} is allowed only in template header.');
 
+Assert::same(
+	'<script> <p n:if=0 /> </script>',
+	$latte->renderToString('{contentType html}<script> <p n:if=0 /> </script>')
+);
+
+Assert::same(
+	'<script>  </script>',
+	$latte->renderToString('{contentType xml}<script> <p n:if=0 /> </script>')
+);
+
+Assert::same(
+	'<p n:if=0 />',
+	$latte->renderToString('{contentType text}<p n:if=0 />')
+);
+
 // defined on $latte
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
diff --git a/tests/tags/expected/n-class.phtml b/tests/tags/expected/n-class.phtml
new file mode 100644
index 0000000000..35a3d746f4
--- /dev/null
+++ b/tests/tags/expected/n-class.phtml
@@ -0,0 +1,35 @@
+%A%
+		foreach ($iterator = $ʟ_it = new LR\CachingIterator([1,2,3], $ʟ_it ?? null) as $foo) /* line %d% */ {
+			echo '	<b';
+			echo ($ʟ_tmp = array_filter([$iterator->even ? 'even' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line %d% */;
+			echo '>item</b>
+';
+			$iterations++;
+		}
+		$iterator = $ʟ_it = $ʟ_it->getParent();
+		echo "\n";
+		$iterations = 0;
+		foreach ($iterator = $ʟ_it = new LR\CachingIterator([1, 2, 3], $ʟ_it ?? null) as $foo) /* line %d% */ {
+			echo '<p';
+			echo ($ʟ_tmp = array_filter([$iterator->even ? 'even' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line %d% */;
+			echo '>';
+			echo LR\Filters::escapeHtmlText($foo) /* line %d% */;
+			echo '</p>
+';
+			$iterations++;
+		}
+		$iterator = $ʟ_it = $ʟ_it->getParent();
+		echo '
+<p';
+		echo ($ʟ_tmp = array_filter(['foo', (false ? 'first' : null), 'odd', (true ? 'foo' : 'bar')])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line %d% */;
+		echo '>n:class</p>
+
+<p';
+		echo ($ʟ_tmp = array_filter([false ? 'first' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line %d% */;
+		echo '>n:class empty</p>
+
+<p';
+		echo ($ʟ_tmp = array_filter([true ? 'bem--modifier' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line %d% */;
+		echo '>n:class with BEM</p>
+';
+%A%
diff --git a/tests/tags/n-attr.phpt b/tests/tags/n-attr.phpt
new file mode 100644
index 0000000000..acd8d803d1
--- /dev/null
+++ b/tests/tags/n-attr.phpt
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * n:attr
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader);
+
+$template = <<<'EOD'
+
+<p n:attr="title => hello, lang => isset($lang) ? $lang"> </p>
+
+<p n:attr="[title => hello]"> </p>
+
+EOD;
+
+Assert::match(
+	<<<'XX'
+%A%
+		echo '
+<p';
+		$ʟ_tmp = ['title' => 'hello', 'lang' => isset($lang) ? $lang : null];
+		echo LR\Filters::htmlAttributes(isset($ʟ_tmp[0]) && is_array($ʟ_tmp[0]) ? $ʟ_tmp[0] : $ʟ_tmp) /* line 2 */;
+		echo '> </p>
+
+<p';
+		$ʟ_tmp = [['title' => 'hello']];
+		echo LR\Filters::htmlAttributes(isset($ʟ_tmp[0]) && is_array($ʟ_tmp[0]) ? $ʟ_tmp[0] : $ʟ_tmp) /* line 4 */;
+		echo '> </p>
+';
+%A%
+XX
+,
+	$latte->compile($template)
+);
+
+Assert::match(
+	<<<'XX'
+
+<p title="hello"> </p>
+
+<p title="hello"> </p>
+XX
+,
+	$latte->renderToString($template)
+);
+
+
+Assert::exception(function () use ($latte) {
+	$latte->compile('<div n:attr/>');
+}, Latte\CompileException::class, 'Missing arguments in n:attr');
+
+
+Assert::exception(function () use ($latte) {
+	$latte->compile('<div n:inner-attr/>');
+}, Latte\CompileException::class, 'Unknown attribute n:inner-attr');
diff --git a/tests/tags/n-class.phpt b/tests/tags/n-class.phpt
new file mode 100644
index 0000000000..e9fe7a031b
--- /dev/null
+++ b/tests/tags/n-class.phpt
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * n:class
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader);
+
+$template = <<<'EOD'
+
+{foreach [1,2,3] as $foo}
+	<b n:class="$iterator->even ? even">item</b>
+{/foreach}
+
+<p n:foreach="[1, 2, 3] as $foo" n:class="$iterator->even ? even">{$foo}</p>
+
+<p n:class="foo, (false ? first), odd, (true ? foo : bar)">n:class</p>
+
+<p n:class="false ? first">n:class empty</p>
+
+<p n:class="true ? bem--modifier">n:class with BEM</p>
+
+EOD;
+
+Assert::matchFile(
+	__DIR__ . '/expected/n-class.phtml',
+	$latte->compile($template)
+);
+
+Assert::match(
+	<<<'XX'
+
+	<b>item</b>
+	<b class="even">item</b>
+	<b>item</b>
+
+<p>1</p>
+<p class="even">2</p>
+<p>3</p>
+
+<p class="foo odd">n:class</p>
+
+<p>n:class empty</p>
+
+<p class="bem--modifier">n:class with BEM</p>
+XX
+,
+	$latte->renderToString($template)
+);
+
+
+Assert::exception(function () use ($latte) {
+	$latte->compile('<div n:class/>');
+}, Latte\CompileException::class, 'Missing arguments in n:class');
+
+
+Assert::exception(function () use ($latte) {
+	$latte->compile('<div n:inner-class/>');
+}, Latte\CompileException::class, 'Unknown attribute n:inner-class');
diff --git a/tests/tags/n-tag.phpt b/tests/tags/n-tag.phpt
index a675ff26a6..37f095645e 100644
--- a/tests/tags/n-tag.phpt
+++ b/tests/tags/n-tag.phpt
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Test: Latte\Engine and n:tag.
+ * n:tag
  */
 
 declare(strict_types=1);