diff --git a/stream-bus/src/main/java/demo/StreamBusApplication.java b/stream-bus/src/main/java/demo/StreamBusApplication.java
index 92a4f76..fbfead4 100644
--- a/stream-bus/src/main/java/demo/StreamBusApplication.java
+++ b/stream-bus/src/main/java/demo/StreamBusApplication.java
@@ -9,7 +9,6 @@ import org.springframework.cloud.stream.messaging.Source;
  * @author Dave Syer
  */
 @SpringBootApplication
-@EnableBinding(Source.class)
 public class StreamBusApplication {
 
 	public static void main(String[] args) {
diff --git a/stream-bus/src/main/resources/application.yml b/stream-bus/src/main/resources/application.yml
index c732361..71eca6d 100644
--- a/stream-bus/src/main/resources/application.yml
+++ b/stream-bus/src/main/resources/application.yml
@@ -1,6 +1,9 @@
 spring:
   application:
     name: stream-bus
+  cloud:
+    function:
+      definition: you
 ---
 spring:
   profiles: other
diff --git a/stream-bus/src/test/java/demo/StreamBusApplicationTests.java b/stream-bus/src/test/java/demo/StreamBusApplicationTests.java
index 0e7893d..6b8f6cf 100644
--- a/stream-bus/src/test/java/demo/StreamBusApplicationTests.java
+++ b/stream-bus/src/test/java/demo/StreamBusApplicationTests.java
@@ -1,55 +1,55 @@
 package demo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import java.util.function.Consumer;
 
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.bus.SpringCloudBusClient;
+import org.springframework.cloud.bus.BusBridge;
 import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent;
-import org.springframework.cloud.stream.messaging.Source;
-import org.springframework.cloud.stream.test.binder.MessageCollector;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = {StreamBusApplicationTests.TestConfig.class, StreamBusApplication.class}, properties = "spring.cloud.bus.destination=you-in-0")
 @DirtiesContext
 public class StreamBusApplicationTests {
 
 	@Autowired
-	private Source source;
+	private BusBridge bus;
 
 	@Autowired
-	private SpringCloudBusClient bus;
-
-	@Autowired
-	private MessageCollector collector;
-
-	@Test
-	public void streaminess() throws Exception {
-		Message<String> message = MessageBuilder.withPayload("Hello").build();
-		this.source.output().send(message);
-		Message<?> received = this.collector.forChannel(this.source.output()).take();
-		assertThat(received.getPayload()).isEqualTo(message.getPayload());
-		assertThat(received.getHeaders()).containsKeys("contentType", "id", "timestamp");
-	}
+	private MyListener myListener;
 
 	@Test
 	public void business() throws Exception {
-		Message<RefreshRemoteApplicationEvent> message = MessageBuilder
-				.withPayload(new RefreshRemoteApplicationEvent(this, "me", "you"))
-				.build();
-		this.bus.springCloudBusOutput().send(message);
-		String payload = (String) this.collector
-				.forChannel(this.bus.springCloudBusOutput()).take().getPayload();
-		assertTrue("Wrong payload: " + payload, payload.contains("\"type\""));
+		RefreshRemoteApplicationEvent event = new RefreshRemoteApplicationEvent(this, "me", "you");
+		this.bus.send(event);
+		RefreshRemoteApplicationEvent event1 = myListener.refreshRemoteApplicationEvent;
+		assertThat(event1).isEqualTo(event);
 	}
 
+	@Configuration
+	static class TestConfig {
+		@Bean(name = "you")
+		MyListener myListener() {
+			return new MyListener();
+		}
+	}
+}
+
+class MyListener implements Consumer<RefreshRemoteApplicationEvent> {
+
+	RefreshRemoteApplicationEvent refreshRemoteApplicationEvent;
+
+	@Override
+	public void accept(RefreshRemoteApplicationEvent refreshRemoteApplicationEvent) {
+		this.refreshRemoteApplicationEvent = refreshRemoteApplicationEvent;
+	}
 }