diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java
index 7e916eac..fae1ceec 100644
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java
+++ b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java
@@ -22,7 +22,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.framework.imps.CuratorFrameworkImpl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -51,13 +50,10 @@
  */
 public class ZookeeperConfigDataCustomizationIntegrationTests {
 
-	private static final Log log = LogFactory
-			.getLog(ZookeeperConfigDataCustomizationIntegrationTests.class);
-
 	public static final String PREFIX = "test__configdata__";
-
 	public static final String ROOT = "/" + PREFIX + UUID.randomUUID();
-
+	private static final Log log = LogFactory
+			.getLog(ZookeeperConfigDataCustomizationIntegrationTests.class);
 	private ConfigurableApplicationContext context;
 	private BindHandlerBootstrapper bindHandlerBootstrapper;
 
@@ -86,8 +82,9 @@ CuratorFramework curatorFramework(BootstrapContext context) {
 		ZookeeperProperties properties = context.get(ZookeeperProperties.class);
 		CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
 				.retryPolicy(CuratorFactory.retryPolicy(properties))
-				.connectString(properties.getConnectString());
-		TestCuratorFramework curator = new TestCuratorFramework(builder);
+				.connectString(properties.getConnectString())
+				.namespace("testnamespace");
+		CuratorFramework curator = builder.build();
 		curator.start();
 		try {
 			curator.blockUntilConnected(properties.getBlockUntilConnectedWait(),
@@ -102,16 +99,11 @@ CuratorFramework curatorFramework(BootstrapContext context) {
 	@Test
 	public void curatorFrameworkIsCustom() {
 		CuratorFramework curator = context.getBean(CuratorFramework.class);
-		assertThat(curator).isNotNull().isInstanceOf(TestCuratorFramework.class);
+		assertThat(curator).isNotNull();
+		assertThat(curator.getNamespace()).isEqualTo("testnamespace");
 		assertThat(bindHandlerBootstrapper.onSuccessCount).isGreaterThan(0);
 	}
 
-	static class TestCuratorFramework extends CuratorFrameworkImpl {
-		TestCuratorFramework(CuratorFrameworkFactory.Builder builder) {
-			super(builder);
-		}
-	}
-
 	@Configuration
 	@EnableAutoConfiguration
 	static class Config {
diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml
index d516a071..77edafd1 100644
--- a/spring-cloud-zookeeper-dependencies/pom.xml
+++ b/spring-cloud-zookeeper-dependencies/pom.xml
@@ -14,7 +14,7 @@
 	<name>spring-cloud-zookeeper-dependencies</name>
 	<description>Spring Cloud Zookeeper Dependencies</description>
 	<properties>
-		<curator.version>5.7.1</curator.version>
+		<curator.version>5.8.0</curator.version>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>