5 files changed, 3 insertions, 4 deletions
diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php
index 859ea8fb04..9ecf0050f6 100644
--- a/tests/PHPUnit/proxy/index.php
+++ b/tests/PHPUnit/proxy/index.php
@@ -17,6 +17,7 @@ define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
+require_once PIWIK_INCLUDE_PATH . '/core/functions.php';
 require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
 
 Piwik_Visualization_Cloud::$debugDisableShuffle = true;
diff --git a/tests/PHPUnit/proxy/libs b/tests/PHPUnit/proxy/libs
deleted file mode 120000
index d63817ad19..0000000000
--- a/tests/PHPUnit/proxy/libs
+++ /dev/null
@@ -1 +0,0 @@
-../../../libs
-\ No newline at end of file
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index 8c5fdb27e3..866038ba82 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -12,6 +12,7 @@
 // Wrapping the request inside ob_start() calls to ensure that the Test
 // calling us waits for the full request to process before unblocking
 use Piwik\Config;
+use Piwik\DataTable\Manager;
 use Piwik\Site;
 
 ob_start();
@@ -37,7 +38,7 @@ Config::getInstance()->Plugins_Tracker['Plugins_Tracker'] = $trackerPlugins;
 Piwik_UserCountry_LocationProvider_GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
 
 Piwik_Tracker::setTestEnvironment();
-Piwik_DataTable_Manager::getInstance()->deleteAll();
+Manager::getInstance()->deleteAll();
 Piwik_Option::getInstance()->clearCache();
 Site::clearCache();
 Piwik_Tracker_Cache::deleteTrackerCache();
diff --git a/tests/PHPUnit/proxy/plugins b/tests/PHPUnit/proxy/plugins
deleted file mode 120000
index 842d50c3ae..0000000000
--- a/tests/PHPUnit/proxy/plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../plugins
-\ No newline at end of file
diff --git a/tests/PHPUnit/proxy/tests b/tests/PHPUnit/proxy/tests
deleted file mode 120000
index c25bddb6dd..0000000000
--- a/tests/PHPUnit/proxy/tests
+++ /dev/null
@@ -1 +0,0 @@
-../..
-\ No newline at end of file