diff --git a/build-spring-framework/build.xml b/build-spring-framework/build.xml
index 60d0ce7c10b..7cb0b7cd322 100644
--- a/build-spring-framework/build.xml
+++ b/build-spring-framework/build.xml
@@ -20,7 +20,7 @@
 		<pathelement location="../org.springframework.web.portlet"/>
 		<pathelement location="../org.springframework.test"/>
 		<pathelement location="../org.springframework.spring-library"/>
-		<pathelement location="../org.springframework.testsuite"/>
+		<pathelement location="../org.springframework.integration-tests"/>
 	</path>
 
 	<property file="${basedir}/../build.properties"/>
diff --git a/org.springframework.testsuite/.classpath b/org.springframework.integration-tests/.classpath
similarity index 100%
rename from org.springframework.testsuite/.classpath
rename to org.springframework.integration-tests/.classpath
diff --git a/org.springframework.testsuite/.project b/org.springframework.integration-tests/.project
similarity index 86%
rename from org.springframework.testsuite/.project
rename to org.springframework.integration-tests/.project
index d1703fc7455..e09fe3e7d83 100644
--- a/org.springframework.testsuite/.project
+++ b/org.springframework.integration-tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.springframework.testsuite</name>
+	<name>org.springframework.integration-tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.springframework.testsuite/.settings/org.eclipse.jdt.core.prefs b/org.springframework.integration-tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.springframework.testsuite/.settings/org.eclipse.jdt.core.prefs
rename to org.springframework.integration-tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.springframework.testsuite/.settings/org.eclipse.jdt.ui.prefs b/org.springframework.integration-tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.springframework.testsuite/.settings/org.eclipse.jdt.ui.prefs
rename to org.springframework.integration-tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.springframework.testsuite/.settings/org.springframework.ide.eclipse.core.prefs b/org.springframework.integration-tests/.settings/org.springframework.ide.eclipse.core.prefs
similarity index 100%
rename from org.springframework.testsuite/.settings/org.springframework.ide.eclipse.core.prefs
rename to org.springframework.integration-tests/.settings/org.springframework.ide.eclipse.core.prefs
diff --git a/org.springframework.testsuite/build.xml b/org.springframework.integration-tests/build.xml
similarity index 81%
rename from org.springframework.testsuite/build.xml
rename to org.springframework.integration-tests/build.xml
index d9b1bf06112..d1f47d03d26 100644
--- a/org.springframework.testsuite/build.xml
+++ b/org.springframework.integration-tests/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.testsuite">
+<project name="org.springframework.integration-tests">
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
diff --git a/org.springframework.testsuite/ivy.xml b/org.springframework.integration-tests/ivy.xml
similarity index 100%
rename from org.springframework.testsuite/ivy.xml
rename to org.springframework.integration-tests/ivy.xml
diff --git a/org.springframework.testsuite/pom.xml b/org.springframework.integration-tests/pom.xml
similarity index 100%
rename from org.springframework.testsuite/pom.xml
rename to org.springframework.integration-tests/pom.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml b/org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
rename to org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
rename to org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
rename to org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
rename to org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
rename to org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
rename to org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml b/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
rename to org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
diff --git a/org.springframework.testsuite/src/test/java/test/advice/CountingAfterReturningAdvice.java b/org.springframework.integration-tests/src/test/java/test/advice/CountingAfterReturningAdvice.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/advice/CountingAfterReturningAdvice.java
rename to org.springframework.integration-tests/src/test/java/test/advice/CountingAfterReturningAdvice.java
diff --git a/org.springframework.testsuite/src/test/java/test/advice/CountingBeforeAdvice.java b/org.springframework.integration-tests/src/test/java/test/advice/CountingBeforeAdvice.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/advice/CountingBeforeAdvice.java
rename to org.springframework.integration-tests/src/test/java/test/advice/CountingBeforeAdvice.java
diff --git a/org.springframework.testsuite/src/test/java/test/advice/MethodCounter.java b/org.springframework.integration-tests/src/test/java/test/advice/MethodCounter.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/advice/MethodCounter.java
rename to org.springframework.integration-tests/src/test/java/test/advice/MethodCounter.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/Colour.java b/org.springframework.integration-tests/src/test/java/test/beans/Colour.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/Colour.java
rename to org.springframework.integration-tests/src/test/java/test/beans/Colour.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/INestedTestBean.java b/org.springframework.integration-tests/src/test/java/test/beans/INestedTestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/INestedTestBean.java
rename to org.springframework.integration-tests/src/test/java/test/beans/INestedTestBean.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/IOther.java b/org.springframework.integration-tests/src/test/java/test/beans/IOther.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/IOther.java
rename to org.springframework.integration-tests/src/test/java/test/beans/IOther.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/ITestBean.java b/org.springframework.integration-tests/src/test/java/test/beans/ITestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/ITestBean.java
rename to org.springframework.integration-tests/src/test/java/test/beans/ITestBean.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/IndexedTestBean.java b/org.springframework.integration-tests/src/test/java/test/beans/IndexedTestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/IndexedTestBean.java
rename to org.springframework.integration-tests/src/test/java/test/beans/IndexedTestBean.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/NestedTestBean.java b/org.springframework.integration-tests/src/test/java/test/beans/NestedTestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/NestedTestBean.java
rename to org.springframework.integration-tests/src/test/java/test/beans/NestedTestBean.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/Pet.java b/org.springframework.integration-tests/src/test/java/test/beans/Pet.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/Pet.java
rename to org.springframework.integration-tests/src/test/java/test/beans/Pet.java
diff --git a/org.springframework.testsuite/src/test/java/test/beans/TestBean.java b/org.springframework.integration-tests/src/test/java/test/beans/TestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/beans/TestBean.java
rename to org.springframework.integration-tests/src/test/java/test/beans/TestBean.java
diff --git a/org.springframework.testsuite/src/test/java/test/interceptor/NopInterceptor.java b/org.springframework.integration-tests/src/test/java/test/interceptor/NopInterceptor.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/interceptor/NopInterceptor.java
rename to org.springframework.integration-tests/src/test/java/test/interceptor/NopInterceptor.java
diff --git a/org.springframework.testsuite/src/test/java/test/interceptor/SerializableNopInterceptor.java b/org.springframework.integration-tests/src/test/java/test/interceptor/SerializableNopInterceptor.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/test/interceptor/SerializableNopInterceptor.java
rename to org.springframework.integration-tests/src/test/java/test/interceptor/SerializableNopInterceptor.java
diff --git a/org.springframework.testsuite/src/test/resources/log4j.xml b/org.springframework.integration-tests/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/resources/log4j.xml
rename to org.springframework.integration-tests/src/test/resources/log4j.xml
diff --git a/org.springframework.testsuite/src/test/resources/org/springframework/util/testlog4j.properties b/org.springframework.integration-tests/src/test/resources/org/springframework/util/testlog4j.properties
similarity index 100%
rename from org.springframework.testsuite/src/test/resources/org/springframework/util/testlog4j.properties
rename to org.springframework.integration-tests/src/test/resources/org/springframework/util/testlog4j.properties
diff --git a/org.springframework.testsuite/src/test/resources/org/springframework/web/util/testlog4j.properties b/org.springframework.integration-tests/src/test/resources/org/springframework/web/util/testlog4j.properties
similarity index 100%
rename from org.springframework.testsuite/src/test/resources/org/springframework/web/util/testlog4j.properties
rename to org.springframework.integration-tests/src/test/resources/org/springframework/web/util/testlog4j.properties
diff --git a/org.springframework.testsuite/src/test/resources/testlog4j.properties b/org.springframework.integration-tests/src/test/resources/testlog4j.properties
similarity index 100%
rename from org.springframework.testsuite/src/test/resources/testlog4j.properties
rename to org.springframework.integration-tests/src/test/resources/testlog4j.properties
diff --git a/org.springframework.integration-tests/template.mf b/org.springframework.integration-tests/template.mf
new file mode 100644
index 00000000000..362b3ea1b7b
--- /dev/null
+++ b/org.springframework.integration-tests/template.mf
@@ -0,0 +1,4 @@
+Bundle-SymbolicName: org.springframework.integration-tests
+Bundle-Name: Spring Framework Integration Tests
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
diff --git a/org.springframework.testsuite/testsuite.iml b/org.springframework.integration-tests/testsuite.iml
similarity index 100%
rename from org.springframework.testsuite/testsuite.iml
rename to org.springframework.integration-tests/testsuite.iml
diff --git a/org.springframework.testsuite/template.mf b/org.springframework.testsuite/template.mf
deleted file mode 100644
index f0da25e6467..00000000000
--- a/org.springframework.testsuite/template.mf
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-SymbolicName: org.springframework.testsuite
-Bundle-Name: Spring Testsuite
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
diff --git a/spring-framework.ipr b/spring-framework.ipr
index 2547a9be9e3..31314ee1afa 100644
--- a/spring-framework.ipr
+++ b/spring-framework.ipr
@@ -222,12 +222,12 @@
           <module name="context-support" />
           <module name="jdbc" />
           <module name="jms" />
-          <module name="org.springframework.testsuite" />
+          <module name="org.springframework.integration-tests" />
           <module name="beans" />
           <module name="context" />
           <module name="orm" />
           <module name="web-servlet" />
-          <module name="testsuite" />
+          <module name="integration-tests" />
           <module name="web">
             <files>
               <file url="file://$PROJECT_DIR$/org.springframework.web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml" />
@@ -239,13 +239,13 @@
       </facet-type>
       <facet-type id="web">
         <modules>
-          <module name="org.springframework.testsuite" />
-          <module name="testsuite" />
+          <module name="org.springframework.integration-tests" />
+          <module name="integration-tests" />
         </modules>
       </facet-type>
       <facet-type id="jpa">
         <modules>
-          <module name="testsuite" />
+          <module name="integration-tests" />
         </modules>
       </facet-type>
       <facet-type id="Grails" />
@@ -533,7 +533,7 @@
       <module fileurl="file://$PROJECT_DIR$/org.springframework.jms/jms.iml" filepath="$PROJECT_DIR$/org.springframework.jms/jms.iml" />
       <module fileurl="file://$PROJECT_DIR$/org.springframework.orm/orm.iml" filepath="$PROJECT_DIR$/org.springframework.orm/orm.iml" />
       <module fileurl="file://$PROJECT_DIR$/org.springframework.test/test.iml" filepath="$PROJECT_DIR$/org.springframework.test/test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/org.springframework.testsuite/testsuite.iml" filepath="$PROJECT_DIR$/org.springframework.testsuite/testsuite.iml" />
+      <module fileurl="file://$PROJECT_DIR$/org.springframework.integration-tests/integration-tests.iml" filepath="$PROJECT_DIR$/org.springframework.integration-tests/integration-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/org.springframework.transaction/transaction.iml" filepath="$PROJECT_DIR$/org.springframework.transaction/transaction.iml" />
       <module fileurl="file://$PROJECT_DIR$/org.springframework.web/web.iml" filepath="$PROJECT_DIR$/org.springframework.web/web.iml" />
       <module fileurl="file://$PROJECT_DIR$/org.springframework.web.portlet/web-portlet.iml" filepath="$PROJECT_DIR$/org.springframework.web.portlet/web-portlet.iml" />