diff --git a/src/Core/System.php b/src/Core/System.php
index 42587577da..89526bdb4e 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -6,6 +6,7 @@ namespace Friendica\Core;
 
 use Friendica\BaseObject;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Util\BaseURL;
 use Friendica\Util\XML;
 
 /**
@@ -29,7 +30,7 @@ class System extends BaseObject
 	 */
 	public static function baseUrl($ssl = false)
 	{
-		return self::getApp()->getBaseURL($ssl);
+		return self::getClass(BaseURL::class)->get($ssl);
 	}
 
 	/**
diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index d00aeeb73d..098337aab9 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -65,9 +65,24 @@ class ApiTest extends DatabaseTest
 		/** @var Database $dba */
 		$dba = $this->dice->create(Database::class);
 
+		/** @var Configuration $config */
+		$this->config = $this->dice->create(Configuration::class);
+
+		$this->config->set('system', 'url', 'http://localhost');
+		$this->config->set('system', 'hostname', 'localhost');
+		$this->config->set('system', 'worker_dont_fork', true);
+
+		// Default config
+		$this->config->set('config', 'hostname', 'localhost');
+		$this->config->set('system', 'throttle_limit_day', 100);
+		$this->config->set('system', 'throttle_limit_week', 100);
+		$this->config->set('system', 'throttle_limit_month', 100);
+		$this->config->set('system', 'theme', 'system_theme');
+
 		// Load the API dataset for the whole API
 		$this->loadFixture(__DIR__ . '/../datasets/api.fixture.php', $dba);
 
+		/** @var App app */
 		$this->app = BaseObject::getApp();
 
 		$this->app->argc = 1;
@@ -106,20 +121,6 @@ class ApiTest extends DatabaseTest
 		$_POST   = [];
 		$_GET    = [];
 		$_SERVER = [];
-
-		/** @var Configuration $config */
-		$this->config = $this->dice->create(Configuration::class);
-
-		$this->config->set('system', 'url', 'http://localhost');
-		$this->config->set('system', 'hostname', 'localhost');
-		$this->config->set('system', 'worker_dont_fork', true);
-
-		// Default config
-		$this->config->set('config', 'hostname', 'localhost');
-		$this->config->set('system', 'throttle_limit_day', 100);
-		$this->config->set('system', 'throttle_limit_week', 100);
-		$this->config->set('system', 'throttle_limit_month', 100);
-		$this->config->set('system', 'theme', 'system_theme');
 	}
 
 	/**
@@ -450,8 +451,8 @@ class ApiTest extends DatabaseTest
 			}
 		];
 		$_SERVER['REQUEST_METHOD'] = 'method';
-		$this->configset('system', 'profiler', true);
-		$this->configset('rendertime', 'callstack', true);
+		$this->config->set('system', 'profiler', true);
+		$this->config->set('rendertime', 'callstack', true);
 		$this->app->callstack = [
 			'database'       => ['some_function' => 200],
 			'database_write' => ['some_function' => 200],
diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 3affe4e778..6938f8ed5a 100644
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -7,6 +7,7 @@ use Friendica\Core\L10n\L10n;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\AppMockTrait;
 use Friendica\Test\Util\VFSTrait;
+use Friendica\Util\BaseURL;
 
 class BBCodeTest extends MockedTest
 {
@@ -44,6 +45,12 @@ class BBCodeTest extends MockedTest
 		$this->dice->shouldReceive('create')
 		           ->with(L10n::class)
 		           ->andReturn($l10nMock);
+
+		$baseUrlMock = \Mockery::mock(BaseURL::class);
+		$baseUrlMock->shouldReceive('get')->withAnyArgs()->andReturn('friendica.local');
+		$this->dice->shouldReceive('create')
+		           ->with(BaseURL::class)
+		           ->andReturn($baseUrlMock);
 	}
 
 	public function dataLinks()