diff --git a/nodepool/tests/test_webapp.py b/nodepool/tests/test_webapp.py
index 3038547b6..75be8e6aa 100644
--- a/nodepool/tests/test_webapp.py
+++ b/nodepool/tests/test_webapp.py
@@ -39,7 +39,7 @@ class TestWebApp(tests.DBTestCase):
             "http://localhost:%s/image-list" % port)
         f = urllib2.urlopen(req)
         self.assertEqual(f.info().getheader('Content-Type'),
-                         'application/text')
+                         'text/plain; charset=UTF-8')
         data = f.read()
         self.assertTrue('fake-image' in data)
 
diff --git a/nodepool/webapp.py b/nodepool/webapp.py
index 9da0cd5dc..288235563 100644
--- a/nodepool/webapp.py
+++ b/nodepool/webapp.py
@@ -93,7 +93,7 @@ class WebApp(threading.Thread):
         if request.path.endswith('.json'):
             content_type = 'application/json'
         else:
-            content_type = 'application/text'
+            content_type = 'text/plain'
 
         response = webob.Response(body=output,
                                   content_type=content_type)