diff --git a/etcd_test.go b/etcd_test.go
index 51721dea7..efc62f286 100644
--- a/etcd_test.go
+++ b/etcd_test.go
@@ -25,9 +25,11 @@ func TestSingleNode(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	etcd.SyncCluster()
+	c := etcd.NewClient()
+
+	c.SyncCluster()
 	// Test Set
-	result, err := etcd.Set("foo", "bar", 100)
+	result, err := c.Set("foo", "bar", 100)
 
 	if err != nil || result.Key != "/foo" || result.Value != "bar" || result.TTL != 99 {
 		if err != nil {
@@ -39,7 +41,7 @@ func TestSingleNode(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	result, err = etcd.Set("foo", "bar", 100)
+	result, err = c.Set("foo", "bar", 100)
 
 	if err != nil || result.Key != "/foo" || result.Value != "bar" || result.PrevValue != "bar" || result.TTL != 99 {
 		if err != nil {
@@ -64,9 +66,11 @@ func TestSingleNodeRecovery(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	etcd.SyncCluster()
+	c := etcd.NewClient()
+
+	c.SyncCluster()
 	// Test Set
-	result, err := etcd.Set("foo", "bar", 100)
+	result, err := c.Set("foo", "bar", 100)
 
 	if err != nil || result.Key != "/foo" || result.Value != "bar" || result.TTL != 99 {
 		if err != nil {
@@ -89,7 +93,7 @@ func TestSingleNodeRecovery(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	results, err := etcd.Get("foo")
+	results, err := c.Get("foo")
 	if err != nil {
 		t.Fatal("get fail: " + err.Error())
 		return
@@ -122,10 +126,12 @@ func TestSimpleMultiNode(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	etcd.SyncCluster()
+	c := etcd.NewClient()
+
+	c.SyncCluster()
 
 	// Test Set
-	result, err := etcd.Set("foo", "bar", 100)
+	result, err := c.Set("foo", "bar", 100)
 
 	if err != nil || result.Key != "/foo" || result.Value != "bar" || result.TTL != 99 {
 		if err != nil {
@@ -137,7 +143,7 @@ func TestSimpleMultiNode(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	result, err = etcd.Set("foo", "bar", 100)
+	result, err = c.Set("foo", "bar", 100)
 
 	if err != nil || result.Key != "/foo" || result.Value != "bar" || result.PrevValue != "bar" || result.TTL != 99 {
 		if err != nil {
@@ -165,7 +171,9 @@ func TestMultiNodeRecovery(t *testing.T) {
 
 	time.Sleep(2 * time.Second)
 
-	etcd.SyncCluster()
+	c := etcd.NewClient()
+
+	c.SyncCluster()
 
 	stop := make(chan bool)
 	// Test Set
diff --git a/test.go b/test.go
index 5ae335131..b95abe5e1 100644
--- a/test.go
+++ b/test.go
@@ -22,11 +22,11 @@ func set(stop chan bool) {
 
 	stopSet := false
 	i := 0
-
+	c := etcd.NewClient()
 	for {
 		key := fmt.Sprintf("%s_%v", "foo", i)
 
-		result, err := etcd.Set(key, "bar", 0)
+		result, err := c.Set(key, "bar", 0)
 
 		if err != nil || result.Key != "/"+key || result.Value != "bar" {
 			select {