diff --git a/acceptance/openstack/blockstorage/v1/.volumes_test.go.swp b/acceptance/openstack/blockstorage/v1/.volumes_test.go.swp
new file mode 100644
index 0000000..1af1ed0
--- /dev/null
+++ b/acceptance/openstack/blockstorage/v1/.volumes_test.go.swp
Binary files differ
diff --git a/acceptance/openstack/blockstorage_test.go b/acceptance/openstack/blockstorage/v1/blockstorage_test.go.bak
similarity index 100%
rename from acceptance/openstack/blockstorage_test.go
rename to acceptance/openstack/blockstorage/v1/blockstorage_test.go.bak
diff --git a/acceptance/openstack/blockstorage/v1/snapshots_test.go b/acceptance/openstack/blockstorage/v1/snapshots_test.go
new file mode 100644
index 0000000..b7b1f99
--- /dev/null
+++ b/acceptance/openstack/blockstorage/v1/snapshots_test.go
@@ -0,0 +1 @@
+package v1
diff --git a/acceptance/openstack/blockstorage/v1/volumes_test.go b/acceptance/openstack/blockstorage/v1/volumes_test.go
new file mode 100644
index 0000000..37d64d4
--- /dev/null
+++ b/acceptance/openstack/blockstorage/v1/volumes_test.go
@@ -0,0 +1,75 @@
+// +build acceptance blockstorage
+
+package v1
+
+import (
+	"os"
+	"strconv"
+	"testing"
+
+	"github.com/rackspace/gophercloud"
+	"github.com/rackspace/gophercloud/openstack"
+	"github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes"
+	"github.com/rackspace/gophercloud/openstack/utils"
+	"github.com/rackspace/gophercloud/pagination"
+)
+
+var numVols = 1
+
+func newClient() (*gophercloud.ServiceClient, error) {
+	ao, err := utils.AuthOptions()
+	if err != nil {
+		return nil, err
+	}
+
+	client, err := openstack.AuthenticatedClient(ao)
+	if err != nil {
+		return nil, err
+	}
+
+	return openstack.NewBlockStorageV1(client, gophercloud.EndpointOpts{
+		Region: os.Getenv("OS_REGION_NAME"),
+	})
+}
+
+func TestVolumes(t *testing.T) {
+	client, err := newClient()
+	if err != nil {
+		t.Fatalf("Failed to create Block Storage v1 client: %v", err)
+	}
+
+	for i := 0; i < numVols; i++ {
+		_, err = volumes.Create(client, volumes.VolumeOpts{
+			Size: 1,
+			Name: "gophercloud-test-volume-" + strconv.Itoa(i),
+		})
+		if err != nil {
+			t.Error(err)
+			return
+		} /*
+			defer func() {
+				time.Sleep(10000 * time.Millisecond)
+				err = volumes.Delete(client, volumes.DeleteOpts{
+					"id": cv.Id,
+				})
+				if err != nil {
+					t.Error(err)
+					return
+				}
+			}()
+		*/
+	}
+
+	pager := volumes.List(client, volumes.ListOpts{})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	err = pager.EachPage(func(page pagination.Page) (bool, error) {
+		vols, err := volumes.ExtractVolumes(page)
+		if len(vols) != numVols {
+			t.Errorf("Expected %d volumes, got %d", numVols, len(vols))
+		}
+		return true, err
+	})
+}