diff --git a/rse/tests/org.eclipse.rse.tests/build.properties b/rse/tests/org.eclipse.rse.tests/build.properties
index dcfd49bdbb5..bf7220f337d 100644
--- a/rse/tests/org.eclipse.rse.tests/build.properties
+++ b/rse/tests/org.eclipse.rse.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
+# Copyright (c) 2001, 2006 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
@@ -28,3 +28,5 @@ bin.includes = rsetests.jar,\
 javacSource = 1.4
 javacTarget = 1.4
 source.rsetests.jar = src/
+src.includes = .settings/,\
+               teamConfig/
diff --git a/rse/tests/org.eclipse.rse.tests/plugin.properties b/rse/tests/org.eclipse.rse.tests/plugin.properties
index fe3684cfee4..3e652a064a2 100644
--- a/rse/tests/org.eclipse.rse.tests/plugin.properties
+++ b/rse/tests/org.eclipse.rse.tests/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
+# Copyright (c) 2001, 2006 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
@@ -9,10 +9,6 @@
 #     IBM Corporation - initial API and implementation
 #     Martin Oberhuber (Wind River) - fix ant build for "assert", make consistent
 ###############################################################################
-
-#
-# Externalized MANIFEST.MF and plugin.xml strings
-#
 pluginName=RSE Unit Tests
 providerName=Eclipse.org
 
diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSETestsResources.properties b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSETestsResources.properties
index cce8f115697..af007a38d68 100644
--- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSETestsResources.properties
+++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSETestsResources.properties
@@ -1,12 +1,13 @@
 ###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
+# Copyright (c) 2001, 2006 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
+# Uwe Stieber (Wind River) - Rework test data location & connection management 
 ###############################################################################
 
 #
diff --git a/rse/tests/org.eclipse.rse.tests/test.data/connectionDefault.properties b/rse/tests/org.eclipse.rse.tests/test.data/connectionDefault.properties
index b7835953c22..e515b554d77 100644
--- a/rse/tests/org.eclipse.rse.tests/test.data/connectionDefault.properties
+++ b/rse/tests/org.eclipse.rse.tests/test.data/connectionDefault.properties
@@ -1,13 +1,14 @@
-# *******************************************************************************
+###############################################################################
 # Copyright (c) 2006 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
+# 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
 # Uwe Stieber (Wind River) - refactoring and cleanup.
-# *******************************************************************************/
+###############################################################################
 
 # The default RSE host node label/name
 name = Local
diff --git a/rse/tests/org.eclipse.rse.tests/test.data/testConnectionManager/connection.properties b/rse/tests/org.eclipse.rse.tests/test.data/testConnectionManager/connection.properties
index b6e6ad6cfd4..cd608efacc5 100644
--- a/rse/tests/org.eclipse.rse.tests/test.data/testConnectionManager/connection.properties
+++ b/rse/tests/org.eclipse.rse.tests/test.data/testConnectionManager/connection.properties
@@ -1,12 +1,13 @@
-# *******************************************************************************
-# Copyright (c) 2006 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
+###############################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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:
 # Uwe Stieber (Wind River) - initial contribution.
-# *******************************************************************************/
+###############################################################################
 
 # Do not change the properties within this file without changing
 # the consuming unittest too!