diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml
index 202114a6f..ecef8c366 100644
--- a/spring-cloud-sleuth-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-zipkin-stream/pom.xml
@@ -60,10 +60,22 @@
 		<dependency>
 			<groupId>io.zipkin.java</groupId>
 			<artifactId>zipkin-server</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.zipkin.java</groupId>
 			<artifactId>zipkin-autoconfigure-storage-mysql</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java
index babc5e221..b55eef7ec 100644
--- a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java
+++ b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java
@@ -1,26 +1,40 @@
 package org.springframework.cloud.sleuth.zipkin.stream;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.cloud.sleuth.stream.SleuthSink;
 import org.springframework.cloud.sleuth.zipkin.stream.ZipkinServerApplicationTests.ZipkinStreamServerApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import zipkin.collector.CollectorMetrics;
+import zipkin.collector.CollectorSampler;
+import zipkin.internal.V2StorageComponent;
+import zipkin.server.ZipkinHttpCollector;
+import zipkin.server.ZipkinQueryApiV1;
+import zipkin.server.ZipkinServerConfiguration;
+import zipkin.server.brave.BraveConfiguration;
 import zipkin.storage.StorageComponent;
+import zipkin2.storage.InMemoryStorage;
 
 import static org.junit.Assert.assertEquals;
 
-// TODO: Fix me
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = ZipkinStreamServerApplication.class, properties = {
 		"spring.datasource.initialize=true" }, webEnvironment = WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("test")
-@Ignore
 public class ZipkinServerApplicationTests {
 
 	@Autowired
@@ -33,7 +47,7 @@ public class ZipkinServerApplicationTests {
 	}
 
 	@SpringBootApplication
-	@EnableZipkinStreamServer
+	@EnableBoot2CompatibleZipkinServer
 	public static class ZipkinStreamServerApplication {
 
 		public static void main(String[] args) throws Exception {
@@ -44,3 +58,54 @@ public class ZipkinServerApplicationTests {
 
 	}
 }
+
+// TODO: Zipkin Server is not Boot 2.0 compatible
+//@EnableZipkinStreamServer
+@EnableBinding(SleuthSink.class)
+@Import({ZipkinMessageListener.class,
+		Boot2ZipkinCompatibleConfig.class,
+		ZipkinQueryApiV1.class,
+		ZipkinHttpCollector.class})
+@interface EnableBoot2CompatibleZipkinServer {
+}
+
+// CollectorMetrics bean definition from `ZipkinServerConfiguration`
+// is not Boot 2.0 compatible
+@Configuration
+class Boot2ZipkinCompatibleConfig {
+
+	@Bean CollectorMetrics collectorMetrics() {
+		CollectorMetrics mock = Mockito.mock(CollectorMetrics.class);
+		Mockito.when(mock.forTransport(Mockito.anyString())).thenReturn(mock);
+		return mock;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(CollectorSampler.class)
+	CollectorSampler traceIdSampler(@Value("${zipkin.collector.sample-rate:1.0}") float rate) {
+		return CollectorSampler.create(rate);
+	}
+
+	/**
+	 * This is a special-case configuration if there's no StorageComponent of any kind. In-Mem can
+	 * supply both read apis, so we add two beans here.
+	 */
+	@Configuration
+	// "matchIfMissing = true" ensures this is used when there's no configured storage type
+	@ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "mem", matchIfMissing = true)
+	@ConditionalOnMissingBean(StorageComponent.class)
+	static class InMemoryConfiguration {
+		@Bean StorageComponent storage(
+				@Value("${zipkin.storage.strict-trace-id:true}") boolean strictTraceId,
+				@Value("${zipkin.storage.mem.max-spans:500000}") int maxSpans) {
+			return V2StorageComponent.create(InMemoryStorage.newBuilder()
+					.strictTraceId(strictTraceId)
+					.maxSpanCount(maxSpans)
+					.build());
+		}
+
+		@Bean InMemoryStorage v2Storage(V2StorageComponent component) {
+			return (InMemoryStorage) component.delegate();
+		}
+	}
+}