[255270] ee6 model providers
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java
index 4f91dc7..13014e1 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java
@@ -64,6 +64,7 @@
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
+import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
 import org.eclipse.wst.common.project.facet.core.IProjectFacet;
 import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
@@ -96,6 +97,7 @@
 	protected void setUp() throws Exception {
 		super.setUp();
 		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		RendererFactory.getDefaultRendererFactory().setValidating(false);
 		if(workspace.getRoot().getProject(PROJECTNAME).isAccessible()) return;
         final IProjectDescription description = workspace
                 .newProjectDescription(PROJECTNAME);
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java
index 9702d86..be02626 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java
@@ -64,6 +64,7 @@
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
+import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
 import org.eclipse.wst.common.project.facet.core.IProjectFacet;
 import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
@@ -96,6 +97,7 @@
 	protected void setUp() throws Exception {
 		super.setUp();
 		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		RendererFactory.getDefaultRendererFactory().setValidating(false);
 		if(workspace.getRoot().getProject(PROJECTNAME).isAccessible()) return;
         final IProjectDescription description = workspace
                 .newProjectDescription(PROJECTNAME);
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/ModelProviderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/ModelProviderTest.java
index 1816278..3fe4912 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/ModelProviderTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/ModelProviderTest.java
@@ -104,7 +104,7 @@
 
 	protected void setUp() throws Exception {
 		super.setUp();
-		//TODO: Remove this line after ws xsd's are restored.
+		
 		RendererFactory.getDefaultRendererFactory().setValidating(false);
 		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		if (workspace.getRoot().getProject(PROJECTNAME).isAccessible())