diff --git a/src/messenger/tests/server_side/webim/classes/DatabaseTest.php b/src/messenger/tests/server_side/webim/libs/classes/DatabaseTest.php
similarity index 98%
rename from src/messenger/tests/server_side/webim/classes/DatabaseTest.php
rename to src/messenger/tests/server_side/webim/libs/classes/DatabaseTest.php
index b9cc022c..3ab93874 100644
--- a/src/messenger/tests/server_side/webim/classes/DatabaseTest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/DatabaseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/database.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/database.php';
 require_once dirname(__FILE__) . '/../config.php';
 
 /**
diff --git a/src/messenger/tests/server_side/webim/classes/EventDispatcherTest.php b/src/messenger/tests/server_side/webim/libs/classes/EventDispatcherTest.php
similarity index 92%
rename from src/messenger/tests/server_side/webim/classes/EventDispatcherTest.php
rename to src/messenger/tests/server_side/webim/libs/classes/EventDispatcherTest.php
index 915901e5..8481c0a6 100644
--- a/src/messenger/tests/server_side/webim/classes/EventDispatcherTest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/EventDispatcherTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/event_dispatcher.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/plugin.php';
-require_once dirname(__FILE__) . '/phpunit_autotest_plugin_manager/phpunit_autotest_plugin_manager_plugin.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/event_dispatcher.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/plugin.php';
+require_once dirname(__FILE__) . '/../../plugins/phpunit_autotest_plugin_manager/phpunit_autotest_plugin_manager_plugin.php';
 
 /**
  * Test class for EventDispatcher.
diff --git a/src/messenger/tests/server_side/webim/classes/MibewAPIExecutionContextTest.php b/src/messenger/tests/server_side/webim/libs/classes/MibewAPIExecutionContextTest.php
similarity index 97%
rename from src/messenger/tests/server_side/webim/classes/MibewAPIExecutionContextTest.php
rename to src/messenger/tests/server_side/webim/libs/classes/MibewAPIExecutionContextTest.php
index f8a1ceb6..c12fc937 100644
--- a/src/messenger/tests/server_side/webim/classes/MibewAPIExecutionContextTest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/MibewAPIExecutionContextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/mibew_api_execution_context.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/mibew_api_execution_context.php';
 
 /**
  * Test class for MibewAPIExecutionContext.
diff --git a/src/messenger/tests/server_side/webim/classes/MibewAPIInteractionTest.php b/src/messenger/tests/server_side/webim/libs/classes/MibewAPIInteractionTest.php
similarity index 93%
rename from src/messenger/tests/server_side/webim/classes/MibewAPIInteractionTest.php
rename to src/messenger/tests/server_side/webim/libs/classes/MibewAPIInteractionTest.php
index 98965415..41ee234e 100644
--- a/src/messenger/tests/server_side/webim/classes/MibewAPIInteractionTest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/MibewAPIInteractionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/mibew_api_interaction.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/mibew_api_interaction.php';
 require_once dirname(__FILE__) . '/mibew_api_test_interaction.php';
 
 /**
diff --git a/src/messenger/tests/server_side/webim/classes/MibewAPITest.php b/src/messenger/tests/server_side/webim/libs/classes/MibewAPITest.php
similarity index 98%
rename from src/messenger/tests/server_side/webim/classes/MibewAPITest.php
rename to src/messenger/tests/server_side/webim/libs/classes/MibewAPITest.php
index 35860e8c..3fcec286 100644
--- a/src/messenger/tests/server_side/webim/classes/MibewAPITest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/MibewAPITest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/mibew_api.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/mibew_api_interaction.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/mibew_api.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/mibew_api_interaction.php';
 require_once dirname(__FILE__) . '/mibew_api_test_interaction.php';
 
 /**
diff --git a/src/messenger/tests/server_side/webim/classes/PluginManagerTest.php b/src/messenger/tests/server_side/webim/libs/classes/PluginManagerTest.php
similarity index 85%
rename from src/messenger/tests/server_side/webim/classes/PluginManagerTest.php
rename to src/messenger/tests/server_side/webim/libs/classes/PluginManagerTest.php
index 0e16aafb..0fd9a686 100644
--- a/src/messenger/tests/server_side/webim/classes/PluginManagerTest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/PluginManagerTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/plugin_manager.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/plugin.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/plugin_manager.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/plugin.php';
 
 /**
  * Test class for PluginManager.
@@ -10,7 +10,7 @@ require_once dirname(__FILE__) . '/../../../../webim/libs/classes/plugin.php';
 class PluginManagerTest extends PHPUnit_Framework_TestCase {
 
 	public function testLoadPlugins() {
-		set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__));
+		set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__) . '/../../plugins/'));
 
 		// Try to load plugin that does not exists
 		// Following code wait for trigger user error, which converts by PHPUnit to an
diff --git a/src/messenger/tests/server_side/webim/classes/SettingsTest.php b/src/messenger/tests/server_side/webim/libs/classes/SettingsTest.php
similarity index 92%
rename from src/messenger/tests/server_side/webim/classes/SettingsTest.php
rename to src/messenger/tests/server_side/webim/libs/classes/SettingsTest.php
index 62dc0b33..e84fd5bb 100644
--- a/src/messenger/tests/server_side/webim/classes/SettingsTest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/SettingsTest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/settings.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/database.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/settings.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/database.php';
 require_once dirname(__FILE__) . '/../config.php';
 
 /**
diff --git a/src/messenger/tests/server_side/webim/classes/ThreadTest.php b/src/messenger/tests/server_side/webim/libs/classes/ThreadTest.php
similarity index 99%
rename from src/messenger/tests/server_side/webim/classes/ThreadTest.php
rename to src/messenger/tests/server_side/webim/libs/classes/ThreadTest.php
index 4f90d4cd..4014b082 100644
--- a/src/messenger/tests/server_side/webim/classes/ThreadTest.php
+++ b/src/messenger/tests/server_side/webim/libs/classes/ThreadTest.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/thread.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/database.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/classes/settings.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/common/locale.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/thread.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/database.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/classes/settings.php';
+require_once dirname(__FILE__) . '/../../../../../webim/libs/common/locale.php';
 require_once dirname(__FILE__) . '/../config.php';
 
 /**
diff --git a/src/messenger/tests/server_side/webim/classes/mibew_api_test_interaction.php b/src/messenger/tests/server_side/webim/libs/classes/mibew_api_test_interaction.php
similarity index 100%
rename from src/messenger/tests/server_side/webim/classes/mibew_api_test_interaction.php
rename to src/messenger/tests/server_side/webim/libs/classes/mibew_api_test_interaction.php
diff --git a/src/messenger/tests/server_side/webim/config.php b/src/messenger/tests/server_side/webim/libs/config.php
similarity index 100%
rename from src/messenger/tests/server_side/webim/config.php
rename to src/messenger/tests/server_side/webim/libs/config.php
diff --git a/src/messenger/tests/server_side/webim/classes/phpunit_autotest_plugin_manager/phpunit_autotest_plugin_manager_plugin.php b/src/messenger/tests/server_side/webim/plugins/phpunit_autotest_plugin_manager/phpunit_autotest_plugin_manager_plugin.php
similarity index 100%
rename from src/messenger/tests/server_side/webim/classes/phpunit_autotest_plugin_manager/phpunit_autotest_plugin_manager_plugin.php
rename to src/messenger/tests/server_side/webim/plugins/phpunit_autotest_plugin_manager/phpunit_autotest_plugin_manager_plugin.php