diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 15d23dc09a6f..12af44a8d7a5 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -606,9 +606,9 @@ class ControllerV11(Controller):
         return self.helper._get_server_admin_password_new_style(server)
 
 
-class HeadersSerializer(wsgi.DictSerializer):
+class HeadersSerializer(wsgi.ResponseHeadersSerializer):
 
-    def delete(self, response):
+    def delete(self, response, data):
         response.status_int = 204
 
 
diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py
index 3d255b40c43e..59cc3b564508 100644
--- a/nova/tests/integrated/api/client.py
+++ b/nova/tests/integrated/api/client.py
@@ -174,7 +174,7 @@ class TestOpenStackClient(object):
 
     def api_delete(self, relative_uri, **kwargs):
         kwargs['method'] = 'DELETE'
-        kwargs.setdefault('check_response_status', [200, 202])
+        kwargs.setdefault('check_response_status', [200, 202, 204])
         return self.api_request(relative_uri, **kwargs)
 
     def get_server(self, server_id):