diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
index 3f58ee395c..4807ae144e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
@@ -5,13 +5,24 @@
 		http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 		http://www.springframework.org/schema/integration
 		http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+
+	<message-bus />
+	<annotation-driven />
+
 	<channel id="inAnnotated" />
 	<channel id="inDefault" />
 	<channel id="inMethodInvoking" />
 	<channel id="out" />
-	<beans:bean id="splitterBean"
-		class="org.springframework.integration.splitter.SplitterIntegrationTests" />
+
 	<splitter ref="splitterBean" input-channel="inMethodInvoking"
 		method="split" output-channel="out" />
-	<!-- <splitter input-channel="inDefault" output-channel="outDefault" /> -->
+
+	<splitter input-channel="inDefault" output-channel="out" />
+
+	<beans:bean id="splitterBean"
+		class="org.springframework.integration.splitter.SplitterIntegrationTests$TestSplitter" />
+
+	<beans:bean
+		class="org.springframework.integration.splitter.SplitterIntegrationTests$Receiver" />
+
 </beans:beans>
\ No newline at end of file
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java
index 99687bf986..cf6fc23486 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
-@MessageEndpoint
 public class SplitterIntegrationTests {
 
 	@Autowired
@@ -40,42 +38,51 @@ public class SplitterIntegrationTests {
 
 	private List<String> words = Arrays.asList(sentence.split("\\s"));
 
-	private List<String> receivedWords = new ArrayList<String>();
+	@Autowired
+	Receiver receiver;
+
+	@MessageEndpoint
+	public static class Receiver {
+		private List<String> receivedWords = new ArrayList<String>();
+
+		@ServiceActivator(inputChannel = "out")
+		public void deliveredWords(String string) {
+			this.receivedWords.add(string);
+		}
+	}
+
+	@MessageEndpoint
+	public static class TestSplitter {
+		@Splitter(inputChannel = "inAnnotated", outputChannel = "out")
+		public List<String> split(String sentence) {
+			return Arrays.asList(sentence.split("\\s"));
+		}
+	}
 
 	@Test
 	public void configOk() throws Exception {
 		// just checking the parsing
 	}
 
-	@Splitter(inputChannel = "inAnnotated", outputChannel = "out")
-	public List<String> split(String sentence) {
-		return Arrays.asList(sentence.split("\\s"));
-	}
-
-	@Test @Ignore
+	@Test
 	public void annotated() throws Exception {
-		inAnnotated.send(new GenericMessage<String>("The quick brown fox jumped over the lazy dog"));
-		assertTrue(this.receivedWords.containsAll(words));
-		assertTrue(words.containsAll(this.receivedWords));
+		inAnnotated.send(new GenericMessage<String>(sentence));
+		assertTrue(this.receiver.receivedWords.containsAll(words));
+		assertTrue(words.containsAll(this.receiver.receivedWords));
 	}
 
-	@ServiceActivator(inputChannel = "out")
-	public void deliveredWords(String string) {
-		this.receivedWords.add(string);
-	}
-
-	@Test @Ignore
+	@Test
 	public void methodInvoking() throws Exception {
-		inMethodInvoking.send(new GenericMessage<String>("The quick brown fox jumped over the lazy dog"));
-		assertTrue(this.receivedWords.containsAll(words));
-		assertTrue(words.containsAll(this.receivedWords));
+		inMethodInvoking.send(new GenericMessage<String>(sentence));
+		assertTrue(receiver.receivedWords.containsAll(words));
+		assertTrue(words.containsAll(this.receiver.receivedWords));
 	}
 
-	@Test @Ignore
+	@Test
 	public void defaultSplitter() throws Exception {
 		inDefault.send(new GenericMessage<List<String>>(words));
-		assertTrue(this.receivedWords.containsAll(words));
-		assertTrue(words.containsAll(this.receivedWords));
+		assertTrue(receiver.receivedWords.containsAll(words));
+		assertTrue(words.containsAll(receiver.receivedWords));
 	}
 
 }