diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
index 43c145e66ef..ca324215195 100644
--- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.tests;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
 Bundle-Activator: org.eclipse.rse.tests.RSETestsPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/rse/tests/org.eclipse.rse.tests/plugin.xml b/rse/tests/org.eclipse.rse.tests/plugin.xml
index aeae0ce338d..b17c8b0b9d4 100644
--- a/rse/tests/org.eclipse.rse.tests/plugin.xml
+++ b/rse/tests/org.eclipse.rse.tests/plugin.xml
@@ -108,11 +108,18 @@
     </systemType>
       <systemType
        description="Linux without shells subsystem"
-            id="org.eclipse.rse.tests.sshTerminal"
+            id="org.eclipse.rse.tests.systemType.sshTerminal"
             label="Ssh without shells"
             name="Ssh without shells"
             subsystemConfigurationIds="ssh.terminals;ssh.files;processes.shell.linux">
       </systemType>
+      <systemType
+       description="FTP with SSH Shell"
+            id="org.eclipse.rse.tests.systemType.ftpSsh"
+            label="FTP with SSH shell"
+            name="FTP with SSH shell"
+            subsystemConfigurationIds="ssh.shells;ftp.files">
+      </systemType>
  </extension>
  
  <extension point="org.eclipse.rse.core.modelInitializers">
diff --git a/rse/tests/org.eclipse.rse.tests/test.data/ftpSshConnection.properties b/rse/tests/org.eclipse.rse.tests/test.data/ftpSshConnection.properties
new file mode 100644
index 00000000000..9e62a720d91
--- /dev/null
+++ b/rse/tests/org.eclipse.rse.tests/test.data/ftpSshConnection.properties
@@ -0,0 +1,28 @@
+###############################################################################
+# Copyright (c) 2009 Wind River Systems, Inc. others. All rights reserved.
+# 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:
+# Martin Oberhuber (Wind River) - initial API and implementation
+###############################################################################
+
+# name/label for this ftp connection
+name = test_ftp_with_ssh
+
+# profile name this connection should be created for
+profile_name = junit_test_profile
+
+# FTP system ID
+system_type_id = org.eclipse.rse.tests.systemType.ftpSsh
+
+# Address of ftp connection
+address = unknown
+
+# userid to connect to ftp connection
+userid = unknown
+
+# password to connect to ftp connection
+password = unknown
\ No newline at end of file
diff --git a/rse/tests/org.eclipse.rse.tests/test.data/sshTerminalConnection.properties b/rse/tests/org.eclipse.rse.tests/test.data/sshTerminalConnection.properties
index 46774247eec..3208d4c66a5 100644
--- a/rse/tests/org.eclipse.rse.tests/test.data/sshTerminalConnection.properties
+++ b/rse/tests/org.eclipse.rse.tests/test.data/sshTerminalConnection.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 IBM Corporation and others. All rights reserved.
+# Copyright (c) 2008, 2009 IBM Corporation and others. All rights reserved.
 # 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
@@ -16,13 +16,13 @@ name = test_ssh_terminals_only
 profile_name = junit_test_profile
 
 # SSH system ID
-system_type_id = org.eclipse.rse.tests.sshTerminal
+system_type_id = org.eclipse.rse.tests.systemType.sshTerminal
 
 # Address of ssh connection
 address = unknown
 
 # userid to connect to ssh connection
-#userid =   
+userid = unknown
 
 # password to connect to ssh connection
-#password =  
+#password =