diff --git a/e107 b/e107
index 7ffb60c60..e92c6789c 160000
--- a/e107
+++ b/e107
@@ -1 +1 @@
-Subproject commit 7ffb60c60b258efea1b1b69f6e49b8f02c12db18
+Subproject commit e92c6789c51c9b653153efe555d1ded9ffbff49f
diff --git a/lib/cpaneluapi b/lib/cpaneluapi
index 958483cd1..c7868a07e 160000
--- a/lib/cpaneluapi
+++ b/lib/cpaneluapi
@@ -1 +1 @@
-Subproject commit 958483cd19412dc3456cb48b551ee95880b3e70a
+Subproject commit c7868a07e4d9fef5878d988501c05ee808b11e51
diff --git a/tests/_support/Helper/Base.php b/tests/_support/Helper/Base.php
index 1e2970201..2367c77b9 100644
--- a/tests/_support/Helper/Base.php
+++ b/tests/_support/Helper/Base.php
@@ -38,11 +38,6 @@ abstract class Base extends \Codeception\Module
 	}
 
 	protected function _callbackDeployerStarted()
-	{
-		return $this->_before();
-	}
-
-	public function _before(\Codeception\TestCase $test = null)
 	{
 		foreach ($this->deployer_components as $component)
 		{
@@ -51,6 +46,11 @@ abstract class Base extends \Codeception\Module
 		}
 	}
 
+	public function _before(\Codeception\TestCase $test = null)
+	{
+		if (is_object($this->deployer)) $this->_callbackDeployerStarted();
+	}
+
 	protected function _reconfigure_fs()
 	{
 		$url = $this->deployer->getUrl();