diff --git a/pom.xml b/pom.xml
index 255afc5..d8cf8a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
   <version>2.1.0.M1</version>
   <name>Spring Integration Flow Support</name>
   <properties>
-    <spring.version>3.1.0.RC1</spring.version>
-    <spring.integration.version>2.1.0.M2</spring.integration.version>
+    <spring.version>3.1.0.RELEASE</spring.version>
+    <spring.integration.version>2.1.0.RELEASE</spring.integration.version>
     <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
   </properties>
   <licenses>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests.java
index 46a6cb3..14c7958 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests.java
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests.java
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.Message;
 import org.springframework.integration.flow.Flow;
-import org.springframework.integration.test.support.AbstractRequestResponseScenarioTest;
+import org.springframework.integration.test.support.AbstractRequestResponseScenarioTests;
 import org.springframework.integration.test.support.MessageValidator;
 import org.springframework.integration.test.support.RequestResponseScenario;
 import org.springframework.test.context.ContextConfiguration;
@@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
-public class FlowClientNamespaceTests extends AbstractRequestResponseScenarioTest {
+public class FlowClientNamespaceTests extends AbstractRequestResponseScenarioTests {
 
 	@Autowired
 	@Qualifier("flowWithProps")
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests.java
index 72c0c5d..f6e2869 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests.java
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests.java
@@ -21,7 +21,7 @@ import org.junit.runner.RunWith;
 import org.springframework.integration.Message;
 import org.springframework.integration.test.support.MessageValidator;
 import org.springframework.integration.test.support.RequestResponseScenario;
-import org.springframework.integration.test.support.SingleRequestResponseScenarioTest;
+import org.springframework.integration.test.support.SingleRequestResponseScenarioTests;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  
@@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
-public class FlowWithReferencesTests extends SingleRequestResponseScenarioTest { 
+public class FlowWithReferencesTests extends SingleRequestResponseScenarioTests { 
 
 /* (non-Javadoc)
  * @see org.springframework.integration.test.support.SingleRequestResponseScenarioTest#defineRequestResponseScenario()