diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 53ca1f8f51..85284a4919 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -184,7 +184,15 @@ class SynapseHomeServer(HomeServer):
             logger.info("Synapse now listening on port %d", unsecure_port)
 
 
-def setup(config, run_http=True):
+def setup():
+    config = HomeServerConfig.load_config(
+        "Synapse Homeserver",
+        sys.argv[1:],
+        generate_section="Homeserver"
+    )
+
+    config.setup_logging()
+
     logger.info("Server hostname: %s", config.server_name)
 
     if re.search(":[0-9]+$", config.server_name):
@@ -204,13 +212,12 @@ def setup(config, run_http=True):
         content_addr=config.content_addr,
     )
 
-    if run_http:
-        hs.register_servlets()
+    hs.register_servlets()
 
-        hs.create_resource_tree(
-            web_client=config.webclient,
-            redirect_root_to_web_client=True,
-        )
+    hs.create_resource_tree(
+        web_client=config.webclient,
+        redirect_root_to_web_client=True,
+    )
 
     db_name = hs.get_db_name()
 
@@ -230,18 +237,11 @@ def setup(config, run_http=True):
         f.namespace['hs'] = hs
         reactor.listenTCP(config.manhole, f, interface='127.0.0.1')
 
-    if run_http:
-        bind_port = config.bind_port
-        if config.no_tls:
-            bind_port = None
-        hs.start_listening(bind_port, config.unsecure_port)
+    bind_port = config.bind_port
+    if config.no_tls:
+        bind_port = None
+    hs.start_listening(bind_port, config.unsecure_port)
 
-    hs.config = config
-
-    return hs
-
-
-def run(config):
     if config.daemonize:
         print config.pid_file
         daemon = Daemonize(
@@ -257,26 +257,13 @@ def run(config):
     else:
         reactor.run()
 
+def run():
+    with LoggingContext("run"):
+        reactor.run()
 
-def main(args, run_http=True):
+def main():
     with LoggingContext("main"):
-        config = HomeServerConfig.load_config(
-            "Synapse Homeserver",
-            args,
-            generate_section="Homeserver"
-        )
-
-        config.setup_logging()
-
-        hs = setup(config, run_http=run_http)
-
-        def r():
-            run(config)
-        hs.run = r
-
-        return hs
-
+        setup()
 
 if __name__ == '__main__':
-    hs = main(sys.argv[1:])
-    hs.run()
+    main()