diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index b0a84824cfc..49e0b006dac 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,4 +1,8 @@
-2004-04-27 Hoda Amer
+2004-04-30 Hoda Amer
+	Final fix for bug#57526 : [CModel] CModelElementsTest needs to test STRUCTURAL_PARSE mode as well
+	Now All CModel tests run twice, once for quick mode and once for Structural mode (Except for IIncludeTests.java
+	
+2004-04-26 Hoda Amer
 	Partial fix for bug#57526 : [CModel] CModelElementsTest needs to test STRUCTURAL_PARSE mode as well
 	Added more tests for Structural Parse to the suit.
 
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTests.java
index 5a84905c312..840250e45ea 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTests.java
@@ -26,7 +26,6 @@ public class AllLanguageInterfaceTests {
 		// each class being tested
         
 		suite.addTest(IIncludeTests.suite());
-		suite.addTest(StructuralIncludeTests.suite());
 		suite.addTest(IMacroTests.suite());
 		suite.addTest(StructuralMacroTests.suite());
 		suite.addTest(IStructureTests.suite());
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java
index 3ff7472cfbe..4f03d166966 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java
@@ -191,7 +191,7 @@ public class ITemplateTests extends IntegratedCModelTest {
 			//"TemplateContainer::fum"
 			{"Bar"},
 		  	//"TemplateParameter::scrum"
-			{"Foo"},
+			{"int"},
 			//"nonVector::first"
 			{"T"},
 			//"IsGreaterThan"
@@ -231,7 +231,7 @@ public class ITemplateTests extends IntegratedCModelTest {
 			"nonVector<T>",
 			"ArrayOverlay<X, Y, int=16>",
 			"fum<Bar>(int) : void",
-			"scrum<Foo>(void) : void", // TODO: deduce the rules of () versus (void), compare below.
+			"scrum<int>(void) : void", // TODO: deduce the rules of () versus (void), compare below.
 			"nonVector<T>::first<T>() : const T&", // TODO: where should <T> be?
 			// TODO: shouldn't signature indicate const function as well?
 			"IsGreaterThan<X>(X, X) : bool",
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralIncludeTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralIncludeTests.java
deleted file mode 100644
index 4899adb56d9..00000000000
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralIncludeTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.cdt.core.model.tests;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author hamer
- *
- */
-public class StructuralIncludeTests extends IIncludeTests {
-	/**
-	 * @param string
-	 */
-	public StructuralIncludeTests(String string) {
-		super( string );
-	}
-
-	
-	/**
-	 * @returns a test suite named after this class
-	 *          containing all its public members named "test*"
-	 */
-	public static Test suite() {
-		TestSuite suite= new TestSuite(StructuralIncludeTests.class);
-		return suite;
-	}		
-
-	public void testGetIncludeName()
-	{
-		setStructuralParse(true);
-//		super.testGetIncludeName();
-	}
-
-	public void testIsStandard()
-	{
-		setStructuralParse(true);
-//		super.testIsStandard();
-	}
-}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java
index d41d9c6ab06..81a518f4487 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java
@@ -152,7 +152,7 @@ public class StructuralTemplateTests extends ITemplateTests {
 			//"TemplateContainer::fum"
 			{"Bar"},
 		  	//"TemplateParameter::scrum"
-			{"Foo"},
+			{"int"},
 			//"IsGreaterThan"
 			{"X"},
 			//"nonVector::first"
@@ -196,7 +196,7 @@ public class StructuralTemplateTests extends ITemplateTests {
 			"nonVector<T>",
 			"ArrayOverlay<X, Y, int=16>",
 			"fum<Bar>(int) : void",
-			"scrum<Foo>(void) : void", // TODO: deduce the rules of () versus (void), compare below.
+			"scrum<int>(void) : void", // TODO: deduce the rules of () versus (void), compare below.
 			// TODO: shouldn't signature indicate const function as well?
 			"IsGreaterThan<X>(X, X) : bool",
 			"first<T>() : const T&", // TODO: where should <T> be?
diff --git a/core/org.eclipse.cdt.core.tests/resources/cmodel/ITemplate.cpp b/core/org.eclipse.cdt.core.tests/resources/cmodel/ITemplate.cpp
index a63e11c7240..9874a1f3fd4 100644
--- a/core/org.eclipse.cdt.core.tests/resources/cmodel/ITemplate.cpp
+++ b/core/org.eclipse.cdt.core.tests/resources/cmodel/ITemplate.cpp
@@ -46,7 +46,7 @@ union ArrayOverlay {
 class TemplateContainer {
 	// these are in an enclosing class
 	template<class Bar> void fum(int i);
-	template<class Foo> void scrum(void) {};
+	template<int> void scrum(void) {};
 };
 
 // TEMPLATE_FUNCTION