diff --git a/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
index b2477fa7a62..127cb19577c 100644
--- a/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
@@ -10,4 +10,10 @@ Require-Bundle: org.junit,
  org.eclipse.swt,
  org.eclipse.jface
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.tm.internal.terminal.speedtest
+Export-Package: org.eclipse.tm.internal.terminal.emulator;x-internal:=true,
+ org.eclipse.tm.internal.terminal.model;x-internal:=true,
+ org.eclipse.tm.internal.terminal.speedtest;x-internal:=true,
+ org.eclipse.tm.internal.terminal.test.terminalcanvas;x-internal:=true,
+ org.eclipse.tm.internal.terminal.test.ui;x-internal:=true,
+ org.eclipse.tm.internal.terminal.textcanvas;x-internal:=true,
+ org.eclipse.tm.terminal.model
diff --git a/terminal/org.eclipse.tm.terminal.test/about.ini b/terminal/org.eclipse.tm.terminal.test/about.ini
new file mode 100644
index 00000000000..fdd61ff0dd8
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal.test/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=eclipse32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
\ No newline at end of file
diff --git a/terminal/org.eclipse.tm.terminal.test/about.mappings b/terminal/org.eclipse.tm.terminal.test/about.mappings
new file mode 100644
index 00000000000..bddaab43109
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal.test/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/terminal/org.eclipse.tm.terminal.test/about.properties b/terminal/org.eclipse.tm.terminal.test/about.properties
new file mode 100644
index 00000000000..99ddff5ef83
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal.test/about.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2007, 2008 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+#
+# Do not translate any values surrounded by {}
+
+blurb=TM Terminal Unit Tests\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Wind River Systems, Inc. and others 2007, 2008.  All rights reserved.\n\
+Visit http://www.eclipse.org/dsdp/tm
diff --git a/terminal/org.eclipse.tm.terminal.test/eclipse32.png b/terminal/org.eclipse.tm.terminal.test/eclipse32.png
new file mode 100644
index 00000000000..568fac1d05f
Binary files /dev/null and b/terminal/org.eclipse.tm.terminal.test/eclipse32.png differ
diff --git a/terminal/org.eclipse.tm.terminal.test/test.xml b/terminal/org.eclipse.tm.terminal.test/test.xml
new file mode 100644
index 00000000000..631d9810945
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal.test/test.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+
+<!--
+Run post build tests. 
+Not yet complete.
+Needs to be updated and tested for org.eclipse.tm.terminal 
+-->
+
+<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}/../../"/>
+
+  <!-- sets the properties eclipse-home, and library-file -->
+  <property name="plugin-name" value="org.eclipse.tm.terminal.test"/>
+  <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 -->
+  <!-- should be done within the body of the suite target. -->
+  <target name="init">
+    <tstamp/>
+    <delete>
+      <fileset dir="${eclipse-home}" includes="org.eclipse.tm.terminal.test.*.xml"/>
+    </delete>
+  </target>
+
+  <!-- This target defines the tests that need to be run. -->
+  <target name="suite">
+    <property name="location" value="${eclipse-home}/terminal_test_workspace"/>
+    <delete dir="${location}" quiet="true"/>
+    <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.tm.terminal.test.RSECombinedTestSuite"/>
+    </ant>
+    
+    <!-- Commented out until source of problem found (not reusing same workspace dir)
+    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="data-dir" value="${session-folder}"/>
+      <property name="plugin-name" value="${plugin-name}"/>
+      <property name="classname"
+                value="org.eclipse.ui.tests.api.SessionRestoreTest"/>
+    </ant>
+    -->
+
+	<!--
+    <property name="sniff-folder"
+              value="${eclipse-home}/ui_sniff_folder"/>
+    <delete dir="${sniff-folder}" quiet="true"/>
+    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="data-dir" value="${sniff-folder}"/>
+      <property name="plugin-name" value="${plugin-name}"/>
+      <property name="classname"
+                value="org.eclipse.ui.tests.UiTestSuite"/>
+
+    </ant>
+    
+    <property name="jface-sniff-folder"
+              value="${eclipse-home}/jface_sniff_folder"/>
+    <delete dir="${jface-sniff-folder}" quiet="true"/>
+    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="data-dir" value="${jface-sniff-folder}"/>
+      <property name="plugin-name" value="${plugin-name}"/>
+      <property name="classname"
+                value="org.eclipse.jface.tests.viewers.AllTests"/>
+    </ant>
+    -->
+    
+  </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 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">
+    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="includes" value="org.eclipse.rse.*.xml"/>
+      <property name="output-file" value="${plugin-name}.xml"/>
+    </ant>
+  </target>
+
+  <!-- This target runs the performance test suites. -->
+  <target name="performance">
+  </target>
+
+</project>