diff --git a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
index 9ae7d03..4637eae 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.jst.ws.tests.performance
 Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: axisPerfmsr.jar
 Bundle-Activator: org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
@@ -24,8 +23,9 @@
  org.eclipse.wst.command.env.ui,
  org.eclipse.wst.command.env.core,
  org.eclipse.wst.common.environment,
- org.eclipse.wst.common.modulecore, 
+ org.eclipse.wst.common.modulecore,
  org.eclipse.emf.ecore,
  org.eclipse.jst.ws.consumption,
- org.eclipse.wst.common.frameworks
+ org.eclipse.wst.common.frameworks,
+ org.eclipse.wst.command.env
 Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.jst.ws.tests.performance/build.properties b/tests/org.eclipse.jst.ws.tests.performance/build.properties
index 99ea6b5..0f7b986 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/build.properties
+++ b/tests/org.eclipse.jst.ws.tests.performance/build.properties
@@ -1,8 +1,6 @@
 bin.includes = plugin.xml,\
                test.xml,\
-               axisPerfmsr.jar,\
                META-INF/,\
                about.html
 jars.compile.order = axisPerfmsr.jar
-source.axisPerfmsr.jar = src/
 output.axisPerfmsr.jar = bin/
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
index a896dc7..88435a1 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
+++ b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ * IBM Corporation - initial API and implementation
+ * yyyymmdd bug      Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20070321   176886 pmoogk@ca.ibm.com - Peter Moogk
  *******************************************************************************/
 package org.eclipse.jst.ws.tests.performance.util;
 
@@ -14,15 +17,14 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jst.ws.tests.util.DynamicPopupJUnitWizard;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.common.environment.IStatusHandler;
+import org.eclipse.wst.command.internal.env.eclipse.BaseStatusHandler;
 
 
 public class PerformanceJUnitUtils {
   
 	private static void launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
 	{
-		IStatusHandler statusHandler = new EclipseStatusHandler();
+		BaseStatusHandler statusHandler = new BaseStatusHandler();
 
         DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler);
         wizard.setInitialData(wizardId);