diff --git a/openstack/client_test.go b/openstack/client_test.go
index 5476271..b403169 100644
--- a/openstack/client_test.go
+++ b/openstack/client_test.go
@@ -52,7 +52,7 @@
 		Password:         "secret",
 		IdentityEndpoint: testhelper.Endpoint(),
 	}
-	client, err := NewClient(options)
+	client, err := AuthenticatedClient(options)
 
 	if err != nil {
 		t.Fatalf("Unexpected error from NewClient: %s", err)
diff --git a/openstack/identity/v3/client_test.go b/openstack/identity/v3/client_test.go
index 6747660..d549f09 100644
--- a/openstack/identity/v3/client_test.go
+++ b/openstack/identity/v3/client_test.go
@@ -15,10 +15,8 @@
 	testhelper.SetupHTTP()
 	defer testhelper.TeardownHTTP()
 
-	provider := &gophercloud.ProviderClient{
-		IdentityEndpoint: testhelper.Endpoint() + "v3/",
-	}
-	client := NewClient(provider)
+	provider := &gophercloud.ProviderClient{}
+	client := NewClient(provider, testhelper.Endpoint()+"v3/")
 
 	expected := testhelper.Endpoint() + "v3/"
 	if client.Endpoint != expected {
@@ -38,10 +36,8 @@
 		fmt.Fprintf(w, `{ "token": { "expires_at": "2013-02-02T18:30:59.000000Z" } }`)
 	})
 
-	provider := &gophercloud.ProviderClient{
-		IdentityEndpoint: testhelper.Endpoint() + "v3/",
-	}
-	client := NewClient(provider)
+	provider := &gophercloud.ProviderClient{}
+	client := NewClient(provider, testhelper.Endpoint()+"v3/")
 
 	token, err := client.GetToken(gophercloud.AuthOptions{UserID: "me", Password: "swordfish"})
 	if err != nil {