diff --git a/marconi/tests/transport/wsgi/test_messages.py b/marconi/tests/transport/wsgi/test_messages.py
index 341a98860..199856315 100644
--- a/marconi/tests/transport/wsgi/test_messages.py
+++ b/marconi/tests/transport/wsgi/test_messages.py
@@ -71,6 +71,8 @@ class TestMessages(util.TestBase):
 
             body = self.app(env, self.srmock)
             self.assertEquals(self.srmock.status, falcon.HTTP_200)
+            self.assertEquals(self.srmock.headers_dict['Content-Location'],
+                              env['PATH_INFO'])
 
             msg = json.loads(body[0])
             self.assertEquals(msg['body'], lookup[msg['ttl']])
@@ -132,6 +134,8 @@ class TestMessages(util.TestBase):
                                      headers=self.headers)
 
         body = self.app(env, self.srmock)
+        self.assertEquals(self.srmock.headers_dict['Content-Location'],
+                          env['PATH_INFO'] + '?' + env['QUERY_STRING'])
 
         cnt = 0
         while self.srmock.status == falcon.HTTP_200:
diff --git a/marconi/transport/wsgi/messages.py b/marconi/transport/wsgi/messages.py
index 194a6fc2c..2f19a1d8d 100644
--- a/marconi/transport/wsgi/messages.py
+++ b/marconi/transport/wsgi/messages.py
@@ -101,7 +101,7 @@ class CollectionResource(object):
                 }
             ]
 
-            resp.location = req.path + '?' + req.query_string
+            resp.content_location = req.path + '?' + req.query_string
             resp.body = json.dumps(resp_dict, ensure_ascii=False)
             resp.status = falcon.HTTP_200
         else:
@@ -121,7 +121,7 @@ class ItemResource(object):
                                     message_id=message_id,
                                     tenant=tenant_id)
 
-            resp.location = req.path + '/' + msg['id']
+            resp.content_location = req.path
             resp.body = json.dumps(msg, ensure_ascii=False)
             resp.status = falcon.HTTP_200