diff --git a/test/autotests/render/nested-tag-shorthand-hyphens-repeated/components/test-message/marko-tag.json b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/components/test-message/marko-tag.json
new file mode 100644
index 000000000..b606e39ee
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/components/test-message/marko-tag.json
@@ -0,0 +1,5 @@
+{
+    "@test-items <test-item>[]": {
+        "@title": "string"
+    }
+}
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens-repeated/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/components/test-message/template.marko
new file mode 100644
index 000000000..9c981bf44
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/components/test-message/template.marko
@@ -0,0 +1,6 @@
+<ul>
+    <li for(item in input.testItems)>
+        <h1>${item.title}</h1>
+        <include(item.renderBody)/>
+    </li>
+</ul>
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens-repeated/expected.html b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/expected.html
new file mode 100644
index 000000000..8c2d9ce4b
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/expected.html
@@ -0,0 +1 @@
+<ul><li><h1>Item 1 title</h1>Item 1 body</li><li><h1>Item 2 title</h1>Item 2 body</li></ul>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens-repeated/template.marko b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/template.marko
new file mode 100644
index 000000000..5ad725ad2
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/template.marko
@@ -0,0 +1,4 @@
+<test-message>
+    <@test-item title="Item 1 title">Item 1 body</@test-item>
+    <@test-item title="Item 2 title">Item 2 body</@test-item>
+</test-message>
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens-repeated/test.js b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/test.js
new file mode 100644
index 000000000..bf8ad099a
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens-repeated/test.js
@@ -0,0 +1,7 @@
+exports.templateData = {
+    header: {
+        renderBody: function(out) {
+            out.write('Header content!');
+        }
+    }
+};
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-hyphens/components/test-message/template.marko
new file mode 100644
index 000000000..2925022d5
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens/components/test-message/template.marko
@@ -0,0 +1,5 @@
+<div class="message">
+    <h1>
+        <include(input.myTitle)/>
+    </h1>
+</div>
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens/expected.html b/test/autotests/render/nested-tag-shorthand-hyphens/expected.html
new file mode 100644
index 000000000..d5370a657
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens/expected.html
@@ -0,0 +1 @@
+<div class="message"><h1>My title</h1></div>
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens/template.marko b/test/autotests/render/nested-tag-shorthand-hyphens/template.marko
new file mode 100644
index 000000000..95b3a0bde
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens/template.marko
@@ -0,0 +1,3 @@
+<test-message>
+    <@my-title>My title</@my-title>
+</test-message>
diff --git a/test/autotests/render/nested-tag-shorthand-hyphens/test.js b/test/autotests/render/nested-tag-shorthand-hyphens/test.js
new file mode 100644
index 000000000..bf8ad099a
--- /dev/null
+++ b/test/autotests/render/nested-tag-shorthand-hyphens/test.js
@@ -0,0 +1,7 @@
+exports.templateData = {
+    header: {
+        renderBody: function(out) {
+            out.write('Header content!');
+        }
+    }
+};