diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index d287e8b47673fc4e0c1601a78df8dd047c440426..90ff2bf2e86037ac77fef3bd7daf4a16797ab9c6 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -268,7 +268,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
 	 */
 	protected static function getTrackerUrl()
 	{
-		return self::getRootUrl().'tests/PHPUnit/proxy-piwik.php';
+		return self::getRootUrl().'tests/PHPUnit/proxy/piwik.php';
 	}
 
     /**
diff --git a/tests/integration/Integration.php b/tests/integration/Integration.php
index 367c32cbc17f3ee819c79455cf75a0ca4ea8b733..6bd8ce4cefe7a5632aef3c6f204edbd9ebca7155 100644
--- a/tests/integration/Integration.php
+++ b/tests/integration/Integration.php
@@ -302,7 +302,7 @@ abstract class Test_Integration extends Test_Database_Base
 	 */
 	protected function getTrackerUrl()
 	{
-		return $this->getRootUrl().'tests/PHPUnit/proxy-piwik.php';
+		return $this->getRootUrl().'tests/PHPUnit/proxy/piwik.php';
 	}
 
 	/**
diff --git a/tests/integration/proxy-piwik.php b/tests/integration/proxy-piwik.php
deleted file mode 100644
index f87a1eab82a8448ecd3a61be2a2b85fd76dc9337..0000000000000000000000000000000000000000
--- a/tests/integration/proxy-piwik.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- *  Proxy to normal piwik.php, but in testing mode
- *  
- *  - Use the tests database to record Tracking data
- *  - Allows to overwrite the Visitor IP, and Server datetime 
- *  
- * @see Main.test.php
- * 
- */
-// Wrapping the request inside ob_start() calls to ensure that the Test
-// calling us waits for the full request to process before unblocking
-ob_start();
-
-define('PIWIK_INCLUDE_PATH', '../..');
-define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
-
-require_once PIWIK_INCLUDE_PATH .'/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Loader.php';
-
-// Config files forced to use the test database
-// Note that this also provides security for Piwik installs containing tests files: 
-// this proxy will not record any data in the production database.
-Piwik::createConfigObject();
-Piwik_Config::getInstance()->setTestEnvironment();	
-Piwik_Config::getInstance()->PluginsInstalled['PluginsInstalled'] = array();
-
-Piwik_Tracker::setTestEnvironment();
-
-include '../../piwik.php';
-ob_flush();