diff --git a/acceptance/openstack/compute/v2/bootfromvolume_test.go b/acceptance/openstack/compute/v2/bootfromvolume_test.go
index 9f18379..d08abe6 100644
--- a/acceptance/openstack/compute/v2/bootfromvolume_test.go
+++ b/acceptance/openstack/compute/v2/bootfromvolume_test.go
@@ -27,10 +27,12 @@
 	name := tools.RandomString("Gophercloud-", 8)
 	t.Logf("Creating server [%s].", name)
 
-	bd := bootfromvolume.BlockDevice{
-		UUID:       choices.ImageID,
-		SourceType: "image",
-		VolumeSize: 10,
+	bd := []bootfromvolume.BlockDevice{
+		bootfromvolume.BlockDevice{
+			UUID:       choices.ImageID,
+			SourceType: bootfromvolume.Image,
+			VolumeSize: 10,
+		},
 	}
 
 	serverCreateOpts := servers.CreateOpts{
@@ -43,6 +45,6 @@
 	}).Extract()
 	th.AssertNoErr(t, err)
 	t.Logf("Created server: %+v\n", server)
-	defer deleteServer(t, client, server)
+	//defer deleteServer(t, client, server)
 	t.Logf("Deleting server [%s]...", name)
 }
diff --git a/acceptance/rackspace/compute/v2/bootfromvolume_test.go b/acceptance/rackspace/compute/v2/bootfromvolume_test.go
index 591a137..010bf42 100644
--- a/acceptance/rackspace/compute/v2/bootfromvolume_test.go
+++ b/acceptance/rackspace/compute/v2/bootfromvolume_test.go
@@ -26,10 +26,12 @@
 	name := tools.RandomString("Gophercloud-", 8)
 	t.Logf("Creating server [%s].", name)
 
-	bd := osBFV.BlockDevice{
-		UUID:       options.imageID,
-		SourceType: "image",
-		VolumeSize: 10,
+	bd := []osBFV.BlockDevice{
+		osBFV.BlockDevice{
+			UUID:       options.imageID,
+			SourceType: osBFV.Image,
+			VolumeSize: 10,
+		},
 	}
 
 	server, err := bootfromvolume.Create(client, servers.CreateOpts{
@@ -39,6 +41,6 @@
 	}).Extract()
 	th.AssertNoErr(t, err)
 	t.Logf("Created server: %+v\n", server)
-	defer deleteServer(t, client, server)
+	//defer deleteServer(t, client, server)
 	t.Logf("Deleting server [%s]...", name)
 }