diff --git a/tests/app/main/test_choose_time_form.py b/tests/app/main/test_choose_time_form.py
index 77e9449f0..fbe1a5330 100644
--- a/tests/app/main/test_choose_time_form.py
+++ b/tests/app/main/test_choose_time_form.py
@@ -5,7 +5,7 @@ from freezegun import freeze_time
 
 
 @freeze_time("2016-01-01 11:09:00.061258")
-def test_form_contains_next_24h():
+def test_form_contains_next_24h(app_):
 
     choices = ChooseTimeForm().scheduled_for.choices
 
@@ -34,12 +34,12 @@ def test_form_contains_next_24h():
 
 
 @freeze_time("2016-01-01 11:09:00.061258")
-def test_form_defaults_to_now(client):
+def test_form_defaults_to_now(app_):
     assert ChooseTimeForm().scheduled_for.data == ''
 
 
 @freeze_time("2016-01-01 11:09:00.061258")
-def test_form_contains_next_three_days():
+def test_form_contains_next_three_days(app_):
     assert ChooseTimeForm().scheduled_for.categories == [
         'Later today', 'Tomorrow', 'Sunday', 'Monday'
     ]
diff --git a/tests/app/test_cloudfoundry_config.py b/tests/app/test_cloudfoundry_config.py
index 81852d7bf..22b8f93c0 100644
--- a/tests/app/test_cloudfoundry_config.py
+++ b/tests/app/test_cloudfoundry_config.py
@@ -16,6 +16,8 @@ def notify_config():
             'admin_client_secret': 'admin client secret',
             'secret_key': 'secret key',
             'dangerous_salt': 'dangerous salt',
+            'route_secret_key_1': 'key 1',
+            'route_secret_key_2': 'key 2',
         }
     }
 
@@ -118,6 +120,8 @@ def test_notify_config():
     assert os.environ['ADMIN_CLIENT_SECRET'] == 'admin client secret'
     assert os.environ['SECRET_KEY'] == 'secret key'
     assert os.environ['DANGEROUS_SALT'] == 'dangerous salt'
+    assert os.environ['ROUTE_SECRET_KEY_1'] == 'key 1'
+    assert os.environ['ROUTE_SECRET_KEY_2'] == 'key 2'
 
 
 @pytest.mark.usefixtures('os_environ', 'cloudfoundry_environ')
diff --git a/tests/conftest.py b/tests/conftest.py
index 9332ba77d..a7364b646 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -32,7 +32,7 @@ from notifications_utils.url_safe_token import generate_token
 import json
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture
 def app_(request):
     app = Flask('app')
     create_app(app)