diff --git a/test/test_endpoints.py b/test/test_endpoints.py
index 8dd200d9b..aa86318a4 100644
--- a/test/test_endpoints.py
+++ b/test/test_endpoints.py
@@ -3,17 +3,19 @@
 import unittest
 import json as py_json
 
-from data import model
-from flask import url_for
-from app import app
-from endpoints.web import web as web_bp
-from endpoints.api import api, api_bp
-from endpoints.api.user import Signin
-from initdb import setup_database_for_testing, finished_database_for_testing
-
 from urllib import urlencode
 from urlparse import urlparse, urlunparse, parse_qs
 
+from flask import url_for
+
+from app import app
+from data import model
+from endpoints.api import api, api_bp
+from endpoints.api.user import Signin
+from endpoints.web import web as web_bp
+from initdb import setup_database_for_testing, finished_database_for_testing
+
+
 try:
   app.register_blueprint(web_bp, url_prefix='')
 except ValueError:
@@ -167,5 +169,19 @@ class WebEndpointTestCase(EndpointTestCase):
   def test_jwk_set_uri(self):
     self.getResponse('web.jwk_set_uri')
 
+
+class KeyServerTestCase(EndpointTestCase):
+  def test_list_service_keys(self):
+    pass
+
+  def test_get_service_key(self):
+    pass
+
+  def test_put_service_key(self):
+    pass
+
+  def test_delete_service_key(self):
+    pass
+
 if __name__ == '__main__':
   unittest.main()