diff --git a/binaries/data/mods/_test.sim/simulation/templates/inherit_a.xml b/binaries/data/mods/_test.sim/simulation/templates/inherit_a.xml
new file mode 100644
index 0000000000..ff7f811e2f
--- /dev/null
+++ b/binaries/data/mods/_test.sim/simulation/templates/inherit_a.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+	<Test2A datatype="tokens">
+		a b c
+	</Test2A>
+</Entity>
diff --git a/binaries/data/mods/_test.sim/simulation/templates/inherit_b.xml b/binaries/data/mods/_test.sim/simulation/templates/inherit_b.xml
new file mode 100644
index 0000000000..987769526d
--- /dev/null
+++ b/binaries/data/mods/_test.sim/simulation/templates/inherit_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="inherit_a">
+	<Test2A datatype="tokens">
+		d
+	</Test2A>
+</Entity>
diff --git a/binaries/data/mods/_test.sim/simulation/templates/inherit_c.xml b/binaries/data/mods/_test.sim/simulation/templates/inherit_c.xml
new file mode 100644
index 0000000000..4774ac2df3
--- /dev/null
+++ b/binaries/data/mods/_test.sim/simulation/templates/inherit_c.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+	<Test2A a="b">
+		a b c
+	</Test2A>
+</Entity>
diff --git a/binaries/data/mods/_test.sim/simulation/templates/inherit_d.xml b/binaries/data/mods/_test.sim/simulation/templates/inherit_d.xml
new file mode 100644
index 0000000000..972d56e2be
--- /dev/null
+++ b/binaries/data/mods/_test.sim/simulation/templates/inherit_d.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="inherit_c">
+	<Test2A c="d"/>
+</Entity>
diff --git a/source/simulation2/tests/test_CmpTemplateManager.h b/source/simulation2/tests/test_CmpTemplateManager.h
index 8103254429..67848604b6 100644
--- a/source/simulation2/tests/test_CmpTemplateManager.h
+++ b/source/simulation2/tests/test_CmpTemplateManager.h
@@ -120,6 +120,28 @@ public:
 		const CParamNode* foundation = tempMan->LoadTemplate(ent2, "foundation|actor|example1", -1);
 		ScriptInterface::ToJSVal(cx, &val, &foundation->GetChild("VisualActor"));
 		TS_ASSERT_STR_EQUALS(man.GetScriptInterface().ToString(&val), "({Actor:\"example1\", ActorOnly:(void 0), Foundation:(void 0), SilhouetteDisplay:\"false\", SilhouetteOccluder:\"false\", VisibleInAtlasOnly:\"false\"})");
+
+#define GET_FIRST_ELEMENT(n, templateName) \
+		const CParamNode* n = tempMan->LoadTemplate(ent2, templateName, -1); \
+		for (CParamNode::ChildrenMap::const_iterator it = n->GetChildren().begin(); it != n->GetChildren().end(); ++it) \
+		{ \
+			if (it->first[0] == '@') \
+				continue; \
+			ScriptInterface::ToJSVal(cx, &val, it->second); \
+			break; \
+		}
+
+		GET_FIRST_ELEMENT(n1, "inherit_a");
+		TS_ASSERT_STR_EQUALS(man.GetScriptInterface().ToString(&val), "({'@datatype':\"tokens\", _string:\"a b c\"})");
+		GET_FIRST_ELEMENT(n2, "inherit_b");
+		TS_ASSERT_STR_EQUALS(man.GetScriptInterface().ToString(&val), "({'@datatype':\"tokens\", _string:\"a b c d\"})");
+
+		GET_FIRST_ELEMENT(n3, "inherit_c");
+		TS_ASSERT_STR_EQUALS(man.GetScriptInterface().ToString(&val), "({'@a':\"b\", _string:\"a b c\"})");
+		GET_FIRST_ELEMENT(n4, "inherit_d");
+		TS_ASSERT_STR_EQUALS(man.GetScriptInterface().ToString(&val), "({'@a':\"b\", '@c':\"d\"})");
+
+#undef GET_FIRST_ELEMENT
 	}
 
 	void test_LoadTemplate_errors()