diff --git a/atst/app.py b/atst/app.py
index 84e7d7be..4b7a0806 100644
--- a/atst/app.py
+++ b/atst/app.py
@@ -83,13 +83,14 @@ def make_flask_callbacks(app):
 
 def map_config(config):
     return {
+        **config["default"],
         "ENV": config["default"]["ENVIRONMENT"],
         "DEBUG": config["default"]["DEBUG"],
         "PORT": int(config["default"]["PORT"]),
         "SQLALCHEMY_DATABASE_URI": config["default"]["DATABASE_URI"],
         "SQLALCHEMY_TRACK_MODIFICATIONS": False,
-        **config["default"],
-        "PERMANENT_SESSION_LIFETIME": int(config["default"]["PERMANENT_SESSION_LIFETIME"]),
+        "WTF_CSRF_ENABLED": config.getboolean("default", "WTF_CSRF_ENABLED"),
+        "PERMANENT_SESSION_LIFETIME": config.getint("default", "PERMANENT_SESSION_LIFETIME"),
     }
 
 
diff --git a/config/ci.ini b/config/ci.ini
index e7e5be1a..3ee7f480 100644
--- a/config/ci.ini
+++ b/config/ci.ini
@@ -3,3 +3,4 @@ PGHOST = postgreshost
 PGDATABASE = atat_test
 REDIS_URI = redis://redishost:6379
 CRL_DIRECTORY = tests/fixtures/crl
+WTF_CSRF_ENABLED = false
diff --git a/config/test.ini b/config/test.ini
index fe38c777..614cdb7b 100644
--- a/config/test.ini
+++ b/config/test.ini
@@ -1,3 +1,4 @@
 [default]
 PGDATABASE = atat_test
 CRL_DIRECTORY = tests/fixtures/crl
+WTF_CSRF_ENABLED = false