diff --git a/tests/unit/framework/console/controllers/AssetControllerTest.php b/tests/unit/framework/console/controllers/AssetControllerTest.php
index ff1d291086..c79840993d 100644
--- a/tests/unit/framework/console/controllers/AssetControllerTest.php
+++ b/tests/unit/framework/console/controllers/AssetControllerTest.php
@@ -114,7 +114,8 @@ class AssetControllerTest extends TestCase
 	 */
 	protected function createBundleConfig()
 	{
-		$baseUrl = '/test';
+		$baseUrl = '';
+		//$baseUrl = '/test';
 		$bundles = array(
 			'app' => array(
 				'basePath' => $this->testFilePath,
@@ -155,6 +156,19 @@ class AssetControllerTest extends TestCase
 		return (file_put_contents($fileName, $content) > 0);
 	}
 
+	/**
+	 * Creates test asset file.
+	 * @param string $fileRelativeName file name relative to [[testFilePath]]
+	 * @param string $content file content
+	 * @return boolean success.
+	 */
+	protected function createTestAssetFile($fileRelativeName, $content)
+	{
+		$fileFullName = $this->testFilePath.DIRECTORY_SEPARATOR.$fileRelativeName;
+		$this->createDir(dirname($fileFullName));
+		return (file_put_contents($fileFullName, $content) > 0);
+	}
+
 	// Tests :
 
 	public function testActionTemplate()
@@ -166,6 +180,20 @@ class AssetControllerTest extends TestCase
 
 	public function testActionCompress()
 	{
+		$this->createTestAssetFile(
+			'css/test.css',
+			'body {
+				padding-top: 20px;
+				padding-bottom: 60px;
+			}'
+		);
+		$this->createTestAssetFile(
+			'js/test.js',
+			"function() {
+				alert('Test message');
+			}"
+		);
+
 		$configFile = $this->testFilePath . DIRECTORY_SEPARATOR . 'config.php';
 		$this->createCompressConfigFile($configFile);
 		$bundleFile = $this->testFilePath . DIRECTORY_SEPARATOR . 'bundle.php';
diff --git a/yii/console/controllers/AssetController.php b/yii/console/controllers/AssetController.php
index 92a9467453..0dd8181192 100644
--- a/yii/console/controllers/AssetController.php
+++ b/yii/console/controllers/AssetController.php
@@ -182,7 +182,7 @@ class AssetController extends Controller
 		foreach ($target->depends as $name) {
 			if (isset($bundles[$name])) {
 				foreach ($bundles[$name]->$type as $file) {
-					$inputFiles[] = $bundles[$name]->basePath . '/' . $file;
+					$inputFiles[] = $bundles[$name]->basePath . $file;
 				}
 			} else {
 				throw new Exception("Unknown bundle: $name");