diff --git a/rse/tests/org.eclipse.rse.tests/test.xml b/rse/tests/org.eclipse.rse.tests/test.xml
index c1abdb9c366..17ff86c7deb 100644
--- a/rse/tests/org.eclipse.rse.tests/test.xml
+++ b/rse/tests/org.eclipse.rse.tests/test.xml
@@ -17,13 +17,17 @@ Needs to be updated and tested for org.eclipse.rse
 -->
 
 <project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}/../../"/>
+	<property name="classname" value="org.eclipse.rse.tests.RSECombinedTestSuite" />
 
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.rse.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}\..\.." />
+<!--  <property name="eclipse-home" value="${basedir}/../../"/> -->
+
+	<!-- sets the properties eclipse-home, and library-file -->
+	<property name="plugin-name" value="org.eclipse.rse.tests" />
+	<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/library.xml" />
+<!--  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/> -->
 
   <!-- This target holds all initialization code that needs to be done for -->
   <!-- all tests that are to be run. Initialization for individual tests -->
@@ -35,6 +39,7 @@ Needs to be updated and tested for org.eclipse.rse
     </delete>
   </target>
 
+
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="location" value="${eclipse-home}/rse_test_workspace"/>
@@ -42,7 +47,7 @@ Needs to be updated and tested for org.eclipse.rse
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${location}"/>
       <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.rse.tests.RSECombinedTestSuite"/>
+      <property name="classname" value="${classname}"/>
     </ant>
     
     <!-- Commented out until source of problem found (not reusing same workspace dir)
@@ -79,11 +84,16 @@ Needs to be updated and tested for org.eclipse.rse
     
   </target>
   
-  <!-- This target holds code to cleanup the testing environment after the tests -->
-  <!-- have been run. You can use this to delete temporary files that are created. -->
-  <target name="cleanup">
-  </target>
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
 
+	
+	
   <!-- This target runs the test suite. Any actions that need to happen after all -->
   <!-- the tests have been run should go here. -->
   <target name="run" depends="init,suite,cleanup">