diff --git a/etcd_test.go b/etcd_test.go
index 124cec6ae..efc62f286 100644
--- a/etcd_test.go
+++ b/etcd_test.go
@@ -25,7 +25,7 @@ func TestSingleNode(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	c := etcd.CreateClient()
+	c := etcd.NewClient()
 
 	c.SyncCluster()
 	// Test Set
@@ -66,7 +66,7 @@ func TestSingleNodeRecovery(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	c := etcd.CreateClient()
+	c := etcd.NewClient()
 
 	c.SyncCluster()
 	// Test Set
@@ -126,7 +126,7 @@ func TestSimpleMultiNode(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	c := etcd.CreateClient()
+	c := etcd.NewClient()
 
 	c.SyncCluster()
 
@@ -171,7 +171,7 @@ func TestMultiNodeRecovery(t *testing.T) {
 
 	time.Sleep(2 * time.Second)
 
-	c := etcd.CreateClient()
+	c := etcd.NewClient()
 
 	c.SyncCluster()
 
diff --git a/test.go b/test.go
index 25cac0190..b95abe5e1 100644
--- a/test.go
+++ b/test.go
@@ -22,7 +22,7 @@ func set(stop chan bool) {
 
 	stopSet := false
 	i := 0
-	c := etcd.CreateClient()
+	c := etcd.NewClient()
 	for {
 		key := fmt.Sprintf("%s_%v", "foo", i)