diff --git a/autoca/ca_app.py b/autoca/ca_app.py
index e0b5edb46cb8a45fed99d0555d36976afdad50a5..fa997ee5882c468e2822faab42003cf512c5c44b 100644
--- a/autoca/ca_app.py
+++ b/autoca/ca_app.py
@@ -92,9 +92,11 @@ def sign():
     return crypto.dump_certificate(crypto.FILETYPE_PEM, signed_cert)
 
 
-def make_app(ca_instance):
+def make_app(ca_instance, settings={}):
     app = Flask(__name__)
     app.register_blueprint(ca_app)
+    if settings:
+        app.config.update(settings)
     app.config.from_envvar('CA_APP_SETTINGS', silent=True)
     app.ca = ca_instance
     return app