diff --git a/2015.07.json b/2015.07.json
index dcf5a083..5362c571 100644
--- a/2015.07.json
+++ b/2015.07.json
@@ -425,7 +425,12 @@
       "required-since": "2014.07",
       "tests": {
         "tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_change_server_password": {
-          "idempotent_id": "id-6158df09-4b82-4ab3-af6d-29cf36af858d"
+          "idempotent_id": "id-6158df09-4b82-4ab3-af6d-29cf36af858d",
+          "flagged": {
+            "reason": "[D400] This test is backend-specific (only works on one hypervisor)",
+            "action": "This test should be removed from future Guidelines.",
+            "date": "2015-08-20"
+          }
         }
       }
     },
diff --git a/2015.next.json b/2015.next.json
index 5c850976..04b4c221 100644
--- a/2015.next.json
+++ b/2015.next.json
@@ -28,7 +28,6 @@
         "compute-instance-actions-list",
         "compute-keypairs-create",
         "compute-quotas-get",
-        "compute-servers-change",
         "compute-servers-create",
         "compute-servers-delete",
         "compute-servers-get",
@@ -54,7 +53,9 @@
         "compute-servers-metadata-update"
         ],
       "advisory": [],
-      "deprecated": [],
+      "deprecated": [
+        "compute-servers-change"
+      ],
       "removed": []
     },
     "object": {
@@ -514,11 +515,17 @@
       "admin": false,
       "status": "required",
       "description": "Basic server operations in the Compute API",
+      "status": "deprecated",
       "project": "nova",
-      "required-since": "2014.07",
+      "required-since": "",
       "tests": {
         "tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_change_server_password": {
-          "idempotent_id": "id-6158df09-4b82-4ab3-af6d-29cf36af858d"
+          "idempotent_id": "id-6158df09-4b82-4ab3-af6d-29cf36af858d",
+          "flagged": {
+            "reason": "[D400] This test is backend-specific (only works on one hypervisor)",
+            "action": "This test should be removed from future Guidelines.",
+            "date": "2015-08-20"
+          }
         }
       }
     },