diff --git a/src/oidc.js b/src/oidc.js
index 1f9a37928..0d3ac441c 100644
--- a/src/oidc.js
+++ b/src/oidc.js
@@ -22,6 +22,7 @@ const assert = require('assert'),
     dashboard = require('./dashboard.js'),
     database = require('./database.js'),
     debug = require('debug')('box:oidc'),
+    dns = require('./dns.js'),
     ejs = require('ejs'),
     express = require('express'),
     eventlog = require('./eventlog.js'),
@@ -791,9 +792,10 @@ async function start() {
         }
     };
 
-    const { fqdn:dashboardFqdn } = await dashboard.getLocation();
-    debug(`start: create provider for ${dashboardFqdn} at ${ROUTE_PREFIX}`);
-    const provider = new Provider(`https://${dashboardFqdn}${ROUTE_PREFIX}`, configuration);
+    const { subdomain, domain } = await dashboard.getLocation();
+    const fqdn = dns.fqdn(subdomain, domain);
+    debug(`start: create provider for ${fqdn} at ${ROUTE_PREFIX}`);
+    const provider = new Provider(`https://${fqdn}${ROUTE_PREFIX}`, configuration);
 
     app.enable('trust proxy');
     provider.proxy = true;
diff --git a/src/routes/test/api-test.js b/src/routes/test/api-test.js
index 8fed018c1..0d570f89c 100644
--- a/src/routes/test/api-test.js
+++ b/src/routes/test/api-test.js
@@ -12,7 +12,7 @@ const common = require('./common.js'),
     timers = require('timers/promises'),
     tokens = require('../../tokens.js');
 
-describe('REST API', function () {
+describe('API', function () {
     const { setup, cleanup, serverUrl, owner, user } = common;
 
     before(setup);
diff --git a/src/routes/test/cloudron-test.js b/src/routes/test/cloudron-test.js
index 932a1a039..d3ce3bd7d 100644
--- a/src/routes/test/cloudron-test.js
+++ b/src/routes/test/cloudron-test.js
@@ -10,7 +10,7 @@ const constants = require('../../constants.js'),
     expect = require('expect.js'),
     superagent = require('superagent');
 
-describe('Cloudron API', function () {
+describe('Cloudron', function () {
     const { setup, cleanup, serverUrl, owner, user, dashboardFqdn } = common;
 
     before(setup);
diff --git a/src/routes/test/common.js b/src/routes/test/common.js
index 09c353819..236692091 100644
--- a/src/routes/test/common.js
+++ b/src/routes/test/common.js
@@ -59,10 +59,10 @@ exports = module.exports = {
 };
 
 async function setupServer() {
-    await database._clear();
-    await oidc.stop();
     await database.initialize();
+    await database._clear();
     await appstore._setApiServerOrigin(exports.mockApiServerOrigin);
+    await oidc.stop();
     await server.start();
 }
 
diff --git a/src/routes/test/provision-test.js b/src/routes/test/provision-test.js
index d5e9bd871..db8e90d64 100644
--- a/src/routes/test/provision-test.js
+++ b/src/routes/test/provision-test.js
@@ -239,4 +239,3 @@ describe('Provision', function () {
         });
     });
 });
-
diff --git a/src/routes/test/system-test.js b/src/routes/test/system-test.js
index b2ffc92f5..62edd69d4 100644
--- a/src/routes/test/system-test.js
+++ b/src/routes/test/system-test.js
@@ -15,7 +15,7 @@ const constants = require('../../constants.js'),
     safe = require('safetydance'),
     superagent = require('superagent');
 
-describe('Cloudron API', function () {
+describe('System', function () {
     const { setup, cleanup, serverUrl, owner, user, waitForTask } = common;
 
     before(setup);