diff --git a/openstack/blockstorage/v2/volumes/results.go b/openstack/blockstorage/v2/volumes/results.go
index 96864ae..2ad94cd 100644
--- a/openstack/blockstorage/v2/volumes/results.go
+++ b/openstack/blockstorage/v2/volumes/results.go
@@ -6,12 +6,13 @@
 )
 
 type Attachment struct {
-	ID         string                          `json:"id"`
-	VolumeID   string                          `json:"volume_id"`
-	ServerID   string                          `json:"instance_uuid"`
-	HostName   string                          `json:"attached_host"`
-	Device     string                          `json:"mountpoint"`
-	AttachedAt gophercloud.JSONRFC3339MilliNoZ `json:"attach_time"`
+	AttachedAt   gophercloud.JSONRFC3339MilliNoZ `json:"attached_at"`
+	AttachmentID string                          `json:"attachment_id"`
+	Device       string                          `json:"device"`
+	HostName     string                          `json:"host_name"`
+	ID           string                          `json:"id"`
+	ServerID     string                          `json:"server_id"`
+	VolumeID     string                          `json:"volume_id"`
 }
 
 // Volume contains all the information associated with an OpenStack Volume.
diff --git a/openstack/blockstorage/v2/volumes/testing/fixtures.go b/openstack/blockstorage/v2/volumes/testing/fixtures.go
index d4b9da0..44d2ca3 100644
--- a/openstack/blockstorage/v2/volumes/testing/fixtures.go
+++ b/openstack/blockstorage/v2/volumes/testing/fixtures.go
@@ -36,15 +36,15 @@
       "encrypted": false,
       "os-vol-host-attr:host": null,
       "availability_zone": "nova",
-      "attachments": [
-        {
-        "id": "47e9ecc5-4045-4ee3-9a4b-d859d546a0cf",
-        "volume_id": "289da7f8-6440-407c-9fb4-7db01ec49164",
-        "instance_uuid": "d1c4788b-9435-42e2-9b81-29f3be1cd01f",
-        "attached_host": "stack",
-        "mountpoint": "/dev/vdc"
-        }
-      ],
+      "attachments": [{
+        "server_id": "83ec2e3b-4321-422b-8706-a84185f52a0a",
+        "attachment_id": "05551600-a936-4d4a-ba42-79a037c1-c91a",
+        "attached_at": "2016-08-06T14:48:20.000000",
+        "host_name": "foobar",
+        "volume_id": "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75",
+        "device": "/dev/vdc",
+        "id": "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75"
+      }],
       "id": "289da7f8-6440-407c-9fb4-7db01ec49164",
       "size": 75,
       "user_id": "ff1ce52c03ab433aaba9108c2e3ef541",
@@ -112,13 +112,14 @@
     "os-vol-host-attr:host": null,
     "availability_zone": "nova",
     "attachments": [{
-        "attachment_id": "dbce64e3-f3b9-4423-a44f-a2b15deffa1b",
-        "id": "3eafc6f5-ed74-456d-90fb-f253f594dbae",
-        "volume_id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
-        "server_id": "d1c4788b-9435-42e2-9b81-29f3be1cd01f",
-        "host_name": "stack",
-        "device": "/dev/vdd"
-        }],
+      "server_id": "83ec2e3b-4321-422b-8706-a84185f52a0a",
+      "attachment_id": "05551600-a936-4d4a-ba42-79a037c1-c91a",
+      "attached_at": "2016-08-06T14:48:20.000000",
+      "host_name": "foobar",
+      "volume_id": "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75",
+      "device": "/dev/vdc",
+      "id": "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75"
+    }],
     "id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
     "size": 75,
     "user_id": "ff1ce52c03ab433aaba9108c2e3ef541",
diff --git a/openstack/blockstorage/v2/volumes/testing/requests_test.go b/openstack/blockstorage/v2/volumes/testing/requests_test.go
index 147beb5..789072a 100644
--- a/openstack/blockstorage/v2/volumes/testing/requests_test.go
+++ b/openstack/blockstorage/v2/volumes/testing/requests_test.go
@@ -32,11 +32,13 @@
 				ID:   "289da7f8-6440-407c-9fb4-7db01ec49164",
 				Name: "vol-001",
 				Attachments: []volumes.Attachment{{
-					ID:       "47e9ecc5-4045-4ee3-9a4b-d859d546a0cf",
-					VolumeID: "289da7f8-6440-407c-9fb4-7db01ec49164",
-					ServerID: "d1c4788b-9435-42e2-9b81-29f3be1cd01f",
-					HostName: "stack",
-					Device:   "/dev/vdc",
+					ServerID:     "83ec2e3b-4321-422b-8706-a84185f52a0a",
+					AttachmentID: "05551600-a936-4d4a-ba42-79a037c1-c91a",
+					AttachedAt:   gophercloud.JSONRFC3339MilliNoZ(time.Date(2016, 8, 6, 14, 48, 20, 0, time.UTC)),
+					HostName:     "foobar",
+					VolumeID:     "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75",
+					Device:       "/dev/vdc",
+					ID:           "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75",
 				}},
 				AvailabilityZone:   "nova",
 				Bootable:           "false",
@@ -108,11 +110,13 @@
 			ID:   "289da7f8-6440-407c-9fb4-7db01ec49164",
 			Name: "vol-001",
 			Attachments: []volumes.Attachment{{
-				ID:       "47e9ecc5-4045-4ee3-9a4b-d859d546a0cf",
-				VolumeID: "289da7f8-6440-407c-9fb4-7db01ec49164",
-				ServerID: "d1c4788b-9435-42e2-9b81-29f3be1cd01f",
-				HostName: "stack",
-				Device:   "/dev/vdc",
+				ServerID:     "83ec2e3b-4321-422b-8706-a84185f52a0a",
+				AttachmentID: "05551600-a936-4d4a-ba42-79a037c1-c91a",
+				AttachedAt:   gophercloud.JSONRFC3339MilliNoZ(time.Date(2016, 8, 6, 14, 48, 20, 0, time.UTC)),
+				HostName:     "foobar",
+				VolumeID:     "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75",
+				Device:       "/dev/vdc",
+				ID:           "d6cacb1a-8b59-4c88-ad90-d70ebb82bb75",
 			}},
 			AvailabilityZone:   "nova",
 			Bootable:           "false",