diff --git a/releng/org.eclipse.tm.releng/build.properties b/releng/org.eclipse.tm.releng/build.properties
index df0eed046f7..184f775e33e 100644
--- a/releng/org.eclipse.tm.releng/build.properties
+++ b/releng/org.eclipse.tm.releng/build.properties
@@ -25,7 +25,8 @@ version=3.2.0
 buildType=N
 branch=HEAD
 mainFeatureToBuildID=org.eclipse.tm.releng.master
-testFeatureToBuildID=org.eclipse.rse.tests
+testFeatureToBuildID=org.eclipse.tm.releng.test
+#testFeatureToBuildID=org.eclipse.rse.tests
 #testFeatureToBuildID=org.eclipse.tm.releng.master
 #testFeatureToBuildID=org.eclipse.tm.terminal.test
 
@@ -58,12 +59,14 @@ http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip
 #dependencyURLs=http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip
 
 build.steps=buildUpdate,buildExtra,buildTests,generateDigests,testLocal,publish,cleanup
+#build.steps=buildZips,buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup,map2psf
+#build.steps=buildZips,buildUpdate,generateDigests,publish,cleanup,map2psf
 
 # this is now set in build.xml
 #localSourceCheckoutDir=/home/anna/RSETM-BUILD-workspace/org.eclipse.tm.tree
 
-compilerArg=-enableJavadoc -encoding ISO-8859-1
-noclean=true
+#noclean=true
+noclean=false
 individualSourceBundles=true
 packageFeaturesIncludedBinaries=true
 flattenDependencies=true
@@ -72,8 +75,19 @@ generateFeatureVersionSuffix=true
 generateAPIDescription=true
 generateSourceReferences=true
 
+#Compiler options
+#javacFailOnError=false
+## Not needed on Athena since set by default
+#javacDebugInfo=on
+#javacVerbose=true
+
+#This fixes a problem with the IBM 1.5 VM, see bug 158358
+#compilerArg=-inlineJSR -enableJavadoc -warn:+javadoc
+#compilerArg=-inlineJSR -enableJavadoc -warn:+javadoc -encoding UTF-8
+compilerArg=-inlineJSR -enableJavadoc -encoding UTF-8
+#compilerArg=-enableJavadoc -encoding ISO-8859-1
+
 # use this to omit pack200 step (does not yet work on Windows - https://bugs.eclipse.org/bugs/show_bug.cgi?id=268405)
 skipPack=true
 skipSign=true
 ## END PROJECT BUILD PROPERTIES ##
-
diff --git a/releng/org.eclipse.tm.releng/testing.properties b/releng/org.eclipse.tm.releng/testing.properties
index 89dbd5bd554..ad6b1acc265 100644
--- a/releng/org.eclipse.tm.releng/testing.properties
+++ b/releng/org.eclipse.tm.releng/testing.properties
@@ -15,9 +15,9 @@ extraVMargs=-ea -Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-x
 #runtime=${zipPrefix}-ALL${incubation}-${buildAlias}.zip
 
 #csv list of test plugins to run
-testPluginsToRun=org.eclipse.rse.tests
+#testPluginsToRun=org.eclipse.rse.tests
 #MOB - cant get the tm.terminal.test to run...
-#testPluginsToRun=org.eclipse.rse.tests,org.eclipse.tm.terminal.test
+testPluginsToRun=org.eclipse.rse.tests,org.eclipse.tm.terminal.test
 
 #map name of test plugin to testsuite class to run
 org.eclipse.rse.tests.suite=org.eclipse.rse.tests.RSECombinedTestSuite