diff --git a/tests/conftest.py b/tests/conftest.py
index 8aa370c3..3a0d4abe 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -48,11 +48,12 @@ def flask_app():
 def flask_client():
     transaction = connection.begin()
 
-    try:
-        client = app.test_client()
-        yield client
-    finally:
-        # roll back all commits made during a test
-        transaction.rollback()
-        Session.rollback()
-        Session.close()
+    with app.app_context():
+        try:
+            client = app.test_client()
+            yield client
+        finally:
+            # roll back all commits made during a test
+            transaction.rollback()
+            Session.rollback()
+            Session.close()