diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
index c16001e..31f52d0 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
@@ -13,6 +13,7 @@
  * 20070314  176886 pmoogk@ca.ibm.com - Peter Moogk
  * 20071030  208124 kathy@ca.ibm.com - Kathy Chan
  * 20071031  208124 kathy@ca.ibm.com - Kathy Chan
+ * 20071116  208124 sengpl@ca.ibm.com - Seng Phung-Lu
  *******************************************************************************/
 package org.eclipse.jst.ws.tests.unittest;
 
@@ -80,9 +81,9 @@
     // Tests which require a Tomcat server
     String s = System.getProperty("org.eclipse.jst.server.tomcat.50");
     if (s != null && s.length() > 0) {
-//      testSuite.addTest( BUJavaAxisTC50.suite() );
-//      testSuite.addTest( TDJavaAxisTC50.suite() );
-//      testSuite.addTest( ClientAxisTC50.suite() );
+      testSuite.addTest( BUJavaAxisTC50.suite() );
+      testSuite.addTest( TDJavaAxisTC50.suite() );
+      testSuite.addTest( ClientAxisTC50.suite() );
       testSuite.addTest( ServerCreationTests.suite());
 
     }
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
index cf96d45..7957f9b 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
@@ -11,6 +11,7 @@
  * -------- -------- -----------------------------------------------------------
  * 20070104   114835 sengpl@ca.ibm.com - Seng Phung-Lu
  * 20070509   180567 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20071116   208124 sengpl@ca.ibm.com - Seng Phung-Lu
  *******************************************************************************/
 package org.eclipse.jst.ws.tests.unittest;
 
@@ -99,7 +100,8 @@
 	protected void initJ2EEWSRuntimeServerDefaults() throws Exception
 	{
 		// Set default preferences for Axis and Tomcat 5.0
-		JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);		
+		JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
+		JUnitUtils.setServiceScenarioDefault();
 	}
 	
   /**
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java
index 204e42e..f818e4e 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java
@@ -11,6 +11,7 @@
  * -------- -------- -----------------------------------------------------------
  * 20070104   114835 sengpl@ca.ibm.com - Seng Phung-Lu
  * 20070509   180567 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20071116   208124 sengpl@ca.ibm.com - Seng Phung-Lu
  *******************************************************************************/
 package org.eclipse.jst.ws.tests.unittest;
 
@@ -91,6 +92,7 @@
 	protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
         // Set default preferences for Axis and Tomcat 5.0    
 		JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
+		JUnitUtils.setClientScenarioDefault();
 	}
 
   /**
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
index c26eac2..8563ae6 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
@@ -11,6 +11,7 @@
  * -------- -------- -----------------------------------------------------------
  * 20070104   114835 sengpl@ca.ibm.com - Seng Phung-Lu
  * 20070509   180567 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20071116   208124 sengpl@ca.ibm.com - Seng Phung-Lu
  *******************************************************************************/
 package org.eclipse.jst.ws.tests.unittest;
 
@@ -89,7 +90,8 @@
    */  
 	protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
 		// Set default preferences for Axis and Tomcat v5.0 server
-		JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);		
+		JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);	
+		JUnitUtils.setServiceScenarioDefault();
 	}
 
   /**
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
index dad9f4d..c7624ba 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
@@ -10,6 +10,7 @@
  * yyyymmdd bug      Email and other contact information
  * -------- -------- -----------------------------------------------------------
  * 20070705  195553 sengpl@ca.ibm.com - Seng Phung-Lu      
+ * 20071116  208124 sengpl@ca.ibm.com - Seng Phung-Lu
  *******************************************************************************/
 package org.eclipse.jst.ws.tests.unittest;
 
@@ -21,7 +22,7 @@
   public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
   public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
 
-  public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
+  public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
   public final String WS_RUNTIMEID_AXIS2 = "org.eclipse.jst.ws.runtime.axis2";
   
   public final String WS_AXIS2_RUNTIME = "org.eclipse.jst.ws.axis2.creation.axis2WebServiceRT";
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
index 52e771d..8c2aca9 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
@@ -14,6 +14,7 @@
  * 20070502  185208 sengpl@ca.ibm.com - Seng Phung-Lu
  * 20070509  180567 sengpl@ca.ibm.com - Seng Phung-Lu 
  * 20070705  195553 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20071116  208124 sengpl@ca.ibm.com - Seng Phung-Lu
  *******************************************************************************/
 package org.eclipse.jst.ws.tests.util;
 
@@ -22,10 +23,7 @@
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -40,6 +38,7 @@
 import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
 import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
 import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
+import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
 import org.eclipse.jst.ws.internal.context.ScenarioContext;
 import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
 import org.eclipse.jst.ws.tests.plugin.TestsPlugin;
@@ -62,9 +61,6 @@
 import org.eclipse.wst.server.core.IServerWorkingCopy;
 import org.eclipse.wst.server.core.ServerCore;
 import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
 import org.eclipse.wst.validation.internal.operations.ValidatorManager;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
@@ -383,4 +379,28 @@
 		return true;
 	}
 	
+	public static void setServiceScenarioDefault() {
+		PersistentScenarioContext context = (PersistentScenarioContext)WebServicePlugin.getInstance().getScenarioContext();
+	      context.setGenerateProxy( false );
+	      context.setLaunchWebServiceExplorer( false );
+	      context.setInstallWebService( false );
+	      context.setInstallClient( false );
+	      context.setStartWebService( false );
+	      context.setTestWebService( false );
+	      context.setMonitorWebService(false);
+	      context.setGenerateWebService(ScenarioContext.WS_DEVELOP);    
+	}
+	
+	public static void setClientScenarioDefault() {
+		PersistentScenarioContext context = (PersistentScenarioContext)WebServicePlugin.getInstance().getScenarioContext();
+	      context.setGenerateProxy( true );
+	      context.setLaunchWebServiceExplorer( false );
+	      context.setInstallWebService( false );
+	      context.setInstallClient( false );
+	      context.setStartWebService( false );
+	      context.setTestWebService( false );
+	      context.setMonitorWebService(false);
+	      context.setGenerateClient(ScenarioContext.WS_DEVELOP);
+	}
+	
 }