diff --git a/e107 b/e107
index 08f7a5d76..f5f2212b5 160000
--- a/e107
+++ b/e107
@@ -1 +1 @@
-Subproject commit 08f7a5d76691fe0460f18abeab581897ae56defa
+Subproject commit f5f2212b54af8c0c82b464891bee93cc1c2e0b29
diff --git a/tests/_support/Helper/E107Base.php b/tests/_support/Helper/E107Base.php
index 6f7f180e8..45b4648e9 100644
--- a/tests/_support/Helper/E107Base.php
+++ b/tests/_support/Helper/E107Base.php
@@ -10,7 +10,7 @@ use Codeception\Lib\ModuleContainer;
 abstract class E107Base extends Base
 {
 	const APP_PATH_E107_CONFIG = APP_PATH."/e107_config.php";
-	public $e107_mySQLprefix = 'e107_';
+	const E107_MYSQL_PREFIX = 'e107_';
 	protected $preparer = null;
 
 	public function __construct(ModuleContainer $moduleContainer, $config = null)
@@ -49,7 +49,7 @@ abstract class E107Base extends Base
 		$e107_config['mySQLuser'] = $db->_getDbUsername();
 		$e107_config['mySQLpassword'] = $db->_getDbPassword();
 		$e107_config['mySQLdefaultdb'] = $db->_getDbName();
-		$e107_config['mySQLprefix'] = $this->e107_mySQLprefix;
+		$e107_config['mySQLprefix'] = self::E107_MYSQL_PREFIX;
 
 		$e107_config_contents = $twig->render('e107_config.php', $e107_config);
 		file_put_contents(self::APP_PATH_E107_CONFIG, $e107_config_contents);
diff --git a/tests/unit/e_db_pdoTest.php b/tests/unit/e_db_pdoTest.php
index 2df9cf149..a376c8824 100644
--- a/tests/unit/e_db_pdoTest.php
+++ b/tests/unit/e_db_pdoTest.php
@@ -119,7 +119,8 @@
 
 			$result = $this->db->database($this->dbConfig['mySQLdefaultdb'], MPREFIX,  true);
 			$this->assertTrue($result);
-			$this->assertEquals("`e107_tests`.e107_", $this->db->mySQLPrefix);
+			$this->assertEquals("`".$this->dbConfig["mySQLdefaultdb"]."`.".\Helper\Unit::E107_MYSQL_PREFIX,
+				$this->db->mySQLPrefix);
 
 
 
@@ -197,7 +198,7 @@
 			  'dblog_user_id' => '1',
 			);
 
-			$this->assertEquals($data, $expected);
+			$this->assertEquals($expected, $data);
 		}