diff --git a/pom.xml b/pom.xml
index aa17c0a..2a5ed6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,12 +54,6 @@
 			<artifactId>eureka-core</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-servlet</artifactId>
-			<version>1.13</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/Application.java b/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/Application.java
index 25affea..c4077ad 100644
--- a/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/Application.java
+++ b/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/Application.java
@@ -17,30 +17,14 @@ package org.springframework.platform.cloudfoundry.broker.sample;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-import com.sun.jersey.spi.container.servlet.ServletContainer;
 
 @Configuration
 @EnableAutoConfiguration
-public class Application extends WebMvcConfigurerAdapter {
+public class Application {
 
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
 
-	@Bean
-	public FilterRegistrationBean jersey() {
-		FilterRegistrationBean bean = new FilterRegistrationBean();
-		bean.setFilter(new ServletContainer());
-		bean.addInitParameter("com.sun.jersey.config.property.WebPageContentRegex",
-				"(/|/(flex/|images/|js/|css/|jsp/|admin/|v2/catalog|v2/service_instances).*)");
-		bean.addInitParameter("com.sun.jersey.config.property.packages",
-				"com.sun.jersey;com.netflix");
-		return bean;
-	}
-
 }
diff --git a/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/ApplicationTests.java b/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/ApplicationTests.java
index 9d2ccd7..30bd0f8 100644
--- a/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/ApplicationTests.java
+++ b/src/test/java/org/springframework/platform/cloudfoundry/broker/sample/ApplicationTests.java
@@ -15,19 +15,35 @@
  */
 package org.springframework.platform.cloudfoundry.broker.sample;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Map;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.TestRestTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = Application.class)
 @WebAppConfiguration
+@IntegrationTest("server.port=0")
 public class ApplicationTests {
+	
+	@Value("${local.server.port}")
+	private int port = 0;
 
 	@Test
-	public void contextLoads() {
+	public void catalogLoads() {
+		@SuppressWarnings("rawtypes")
+		ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/v2/catalog", Map.class);
+		assertEquals(HttpStatus.OK, entity.getStatusCode());
 	}
 
-}
+}
\ No newline at end of file