diff --git a/tests/__init__.py b/tests/__init__.py
index 09401879..e0c6aa15 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -20,13 +20,16 @@
 #
 # Written by Matt Prahl <mprahl@redhat.com
 
+import module_build_service
+
 from datetime import datetime, timedelta
-from module_build_service import app, db
-from module_build_service.config import from_app_config
+from module_build_service import db
+from module_build_service.config import init_config
 from module_build_service.models import ModuleBuild, ComponentBuild
 
-app.config.from_object('config.TestConfiguration')
-conf = from_app_config()
+app = module_build_service.app
+
+conf = init_config(app)
 
 
 def init_data():
diff --git a/tests/test_models/__init__.py b/tests/test_models/__init__.py
index c59b1b70..19df3e37 100644
--- a/tests/test_models/__init__.py
+++ b/tests/test_models/__init__.py
@@ -22,14 +22,17 @@
 
 import os
 
+import module_build_service
 import modulemd
+
 from datetime import datetime
-from module_build_service import app, db
-from module_build_service.config import from_app_config
+from module_build_service import db
+from module_build_service.config import init_config
 from module_build_service.models import ModuleBuild, BUILD_STATES
 
-app.config.from_object('config.TestConfiguration')
-conf = from_app_config()
+app = module_build_service.app
+
+conf = init_config(app)
 
 datadir = os.path.dirname(__file__) + '/data/'