diff --git a/acceptance/openstack/storage_test.go b/acceptance/openstack/storage_test.go
index 1cb3bad..7daaa45 100644
--- a/acceptance/openstack/storage_test.go
+++ b/acceptance/openstack/storage_test.go
@@ -4,36 +4,35 @@
 
 import (
 	"bytes"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/acceptance/tools"
-	storage "github.com/rackspace/gophercloud/openstack/storage/v1"
+	"github.com/rackspace/gophercloud/openstack"
 	"github.com/rackspace/gophercloud/openstack/storage/v1/accounts"
 	"github.com/rackspace/gophercloud/openstack/storage/v1/containers"
 	"github.com/rackspace/gophercloud/openstack/storage/v1/objects"
 	"github.com/rackspace/gophercloud/openstack/utils"
-	"os"
-	"strings"
-	"testing"
 )
 
 var metadata = map[string]string{"gopher": "cloud"}
 var numContainers = 2
 var numObjects = 2
 
-func newClient() (*storage.Client, error) {
+func newClient() (*gophercloud.ServiceClient, error) {
 	ao, err := utils.AuthOptions()
 	if err != nil {
 		return nil, err
 	}
 
-	client, err := utils.NewClient(ao, utils.EndpointOpts{
-		Region: os.Getenv("OS_REGION_NAME"),
-		Type:   "object-store",
-	})
+	client, err := openstack.AuthenticatedClient(ao)
 	if err != nil {
 		return nil, err
 	}
 
-	return storage.NewClient(client.Endpoint, client.Authority, client.Options), nil
+	return openstack.NewStorageV1(client, os.Getenv("OS_REGION_NAME"))
 }
 
 func TestAccount(t *testing.T) {
diff --git a/acceptance/tools/tools.go b/acceptance/tools/tools.go
index 5852650..396241c 100644
--- a/acceptance/tools/tools.go
+++ b/acceptance/tools/tools.go
@@ -10,7 +10,7 @@
 	"time"
 
 	"github.com/rackspace/gophercloud"
-	servers "github.com/rackspace/gophercloud/openstack/compute/v2/servers"
+	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 	identity "github.com/rackspace/gophercloud/openstack/identity/v2"
 	"github.com/rackspace/gophercloud/openstack/utils"
 )