diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index c47f74685d2..b3964eff42c 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -80,13 +80,13 @@
             id="org.eclipse.cdt.core.tests.templates.AddFile"
             filterPattern=".*AddFile"
             isCategory="true"
-            location="testdata/AddFile.xml"
+            location="resources/templateengine/AddFile.xml"
             projectType="org.eclipse.cdt.core.tests.projectType">
       </template>
       <template
             id="org.eclipse.cdt.core.tests.templates.AddFiles"
             filterPattern=".*AddFiles"
-            location="testdata/AddFiles.xml"
+            location="resources/templateengine/AddFiles.xml"
             projectType="org.eclipse.cdt.core.tests.projectType">
          <toolChain id="org.eclipse.cdt.core.tests.toolChain1"/>
          <toolChain id="org.eclipse.cdt.core.tests.toolChain2"/>
@@ -94,33 +94,33 @@
       <template
             id="org.eclipse.cdt.core.tests.templates.AddLink"
             filterPattern=".*AddLink"
-            location="testdata/AddLink.xml"
+            location="resources/templateengine/AddLink.xml"
             projectType="org.eclipse.cdt.core.tests.projectType">
       </template>
       <template
             id="org.eclipse.cdt.core.tests.templates.Append"
             filterPattern=".*Append"
-            location="testdata/Append.xml"
+            location="resources/templateengine/Append.xml"
             projectType="org.eclipse.cdt.core.tests.projectType"/>
       <template
             id="org.eclipse.cdt.core.tests.templates.AppendCreate"
             filterPattern=".*AppendCreate"
-            location="testdata/AppendCreate.xml"
+            location="resources/templateengine/AppendCreate.xml"
             projectType="org.eclipse.cdt.core.tests.projectType"/>
       <template
             id="org.eclipse.cdt.core.tests.templates.Copy"
             filterPattern=".*Copy"
-            location="testdata/Copy.xml"
+            location="resources/templateengine/Copy.xml"
             projectType="org.eclipse.cdt.core.tests.projectType"/>
       <template
             id="org.eclipse.cdt.core.tests.templates.CreateResourceIdentifier"
             filterPattern=".*CreateResourceIdentifier"
-            location="testdata/CreateResourceIdentifier.xml"
+            location="resources/templateengine/CreateResourceIdentifier.xml"
             projectType="org.eclipse.cdt.core.tests.projectType"/>
       <template
             id="org.eclipse.cdt.core.tests.templates.CreateSourceFolder"
             filterPattern=".*CreateSourceFolder"
-            location="testdata/CreateSourceFolder.xml"
+            location="resources/templateengine/CreateSourceFolder.xml"
             projectType="org.eclipse.cdt.core.tests.projectType"/>
    </extension>
    <extension
diff --git a/core/org.eclipse.cdt.core.tests/testdata/AddFile.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/AddFile.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/AddFile.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/AddFile.xml
diff --git a/core/org.eclipse.cdt.core.tests/testdata/AddFiles.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/AddFiles.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/AddFiles.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/AddFiles.xml
diff --git a/core/org.eclipse.cdt.core.tests/testdata/AddLink.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/AddLink.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/AddLink.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/AddLink.xml
diff --git a/core/org.eclipse.cdt.core.tests/testdata/Append.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/Append.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/Append.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/Append.xml
diff --git a/core/org.eclipse.cdt.core.tests/testdata/AppendCreate.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/AppendCreate.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/AppendCreate.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/AppendCreate.xml
diff --git a/core/org.eclipse.cdt.core.tests/testdata/Basename.cpp b/core/org.eclipse.cdt.core.tests/resources/templateengine/Basename.cpp
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/Basename.cpp
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/Basename.cpp
diff --git a/core/org.eclipse.cdt.core.tests/testdata/Basename.h b/core/org.eclipse.cdt.core.tests/resources/templateengine/Basename.h
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/Basename.h
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/Basename.h
diff --git a/core/org.eclipse.cdt.core.tests/testdata/Copy.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/Copy.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/Copy.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/Copy.xml
diff --git a/core/org.eclipse.cdt.core.tests/testdata/CreateResourceIdentifier.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/CreateResourceIdentifier.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/CreateResourceIdentifier.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/CreateResourceIdentifier.xml
diff --git a/core/org.eclipse.cdt.core.tests/testdata/CreateSourceFolder.xml b/core/org.eclipse.cdt.core.tests/resources/templateengine/CreateSourceFolder.xml
similarity index 100%
rename from core/org.eclipse.cdt.core.tests/testdata/CreateSourceFolder.xml
rename to core/org.eclipse.cdt.core.tests/resources/templateengine/CreateSourceFolder.xml
diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java
index ba8efe59c0a..41fd7ca8ed9 100644
--- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java
+++ b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java
@@ -51,7 +51,7 @@ public class TemplateEngineTestsHelper {
 	 */
 	public static URL getTemplateURL(String templateName){
 		Bundle bundle = Platform.getBundle(CTestPlugin.PLUGIN_ID);
-		URL url = FileLocator.find(bundle, new Path("testdata/"+templateName), null); //$NON-NLS-1$
+		URL url = FileLocator.find(bundle, new Path("resources/templateengine/"+templateName), null); //$NON-NLS-1$
 		if ( url != null )
 		{ 
 			try {