diff --git a/tests/framework/caching/CFileCacheTest.php b/tests/framework/caching/CFileCacheTest.php
index 82ca71667..4ba793684 100644
--- a/tests/framework/caching/CFileCacheTest.php
+++ b/tests/framework/caching/CFileCacheTest.php
@@ -2,6 +2,68 @@
 
 class CFileCacheTest extends CTestCase
 {
+	private $cachePathModes=array(
+		0777,0775,0770,0755,0750,0700
+	);
+
+	private $cacheFileModes=array(
+		0666,0664,0660,0644,0640,0600
+	);
+
+	private $cachePath;
+
+	public function setUp()
+	{
+		$this->cachePath=Yii::getPathOfAlias('application.runtime.CFileCacheTest');
+		if(!is_dir($this->cachePath) && !(@mkdir($this->cachePath)))
+			$this->markTestIncomplete('Unit tests runtime directory should have writable permissions!');
+
+		if (substr(PHP_OS,0,3)=='WIN')
+			$this->markTestSkipped("Can't reliably test it on Windows because fileperms() always return 0777.");
+	}
+
+	public function testPathMode()
+	{
+		foreach ($this->cachePathModes as $testMode)
+		{
+			$this->removeDirectory($this->cachePath);
+			$app=new TestApplication(array(
+				'id'=>'testApp',
+				'components'=>array(
+					'cache'=>array('class'=>'CFileCache','cachePath'=>$this->cachePath,'cachePathMode'=>$testMode),
+				),
+			));
+			/** @var CFileCache $cache */
+			$cache=$app->cache;
+
+			$this->assertTrue(is_dir($cache->cachePath));
+			$this->assertEquals(sprintf('%04o',$testMode),$this->getMode($cache->cachePath));
+		}
+	}
+
+	public function testFileMode()
+	{
+		foreach ($this->cacheFileModes as $testMode)
+		{
+			$this->removeDirectory($this->cachePath);
+			$app=new TestApplication(array(
+				'id'=>'testApp',
+				'components'=>array(
+					'cache'=>array('class'=>'CFileCache','cachePath'=>$this->cachePath,'cacheFileMode'=>$testMode),
+				),
+			));
+			/** @var CFileCache $cache */
+			$cache=$app->cache;
+
+			$cache->set('testKey1','testValue1');
+			$files=glob($cache->cachePath.'/*.bin');
+			$file=array_shift($files);
+
+			$this->assertTrue(is_file($file));
+			$this->assertEquals(sprintf('%04o',$testMode),$this->getMode($file));
+		}
+	}
+
 	/**
 	 * https://github.com/yiisoft/yii/issues/2435
 	 */
@@ -10,14 +72,14 @@ class CFileCacheTest extends CTestCase
 		$app=new TestApplication(array(
 			'id'=>'testApp',
 			'components'=>array(
-				'cache'=>array('class'=>'CFileCache'),
+				'cache'=>array('class'=>'CFileCache','cachePath'=>$this->cachePath),
 			),
 		));
 		$app->reset();
 		$cache=$app->cache;
 
 		$cache->set('testKey1','testValue1',2);
-		$files=glob(Yii::getPathOfAlias('application.runtime.cache').'/*.bin');
+		$files=glob($cache->cachePath.'/*.bin');
 		$this->assertEquals(time()+2,filemtime($files[0]));
 
 		$cache->set('testKey2','testValue2',2);
@@ -32,14 +94,14 @@ class CFileCacheTest extends CTestCase
 		$app=new TestApplication(array(
 			'id'=>'testApp',
 			'components'=>array(
-				'cache'=>array('class'=>'CFileCache','embedExpiry'=>true),
+				'cache'=>array('class'=>'CFileCache','cachePath'=>$this->cachePath,'embedExpiry'=>true),
 			),
 		));
 		$app->reset();
 		$cache=$app->cache;
 
 		$cache->set('testKey4','testValue4',2);
-		$files=glob(Yii::getPathOfAlias('application.runtime.cache').'/*.bin');
+		$files=glob($cache->cachePath.'/*.bin');
 		$this->assertEquals(time(),filemtime($files[0]));
 
 		$cache->set('testKey5','testValue5',2);
@@ -50,4 +112,31 @@ class CFileCacheTest extends CTestCase
 		sleep(3);
 		$this->assertEquals(false,$cache->get('testKey6'));
 	}
+
+	public function tearDown()
+	{
+		$this->removeDirectory($this->cachePath);
+	}
+
+	private function getMode($file)
+	{
+		return substr(sprintf('%04o',fileperms($file)),-4);
+	}
+
+	/** @see CFileHelper::removeDirectory */
+	private function removeDirectory($directory)
+	{
+		$items=glob($directory.DIRECTORY_SEPARATOR.'{,.}*',GLOB_MARK | GLOB_BRACE);
+		foreach($items as $item)
+		{
+			if(basename($item)=='.' || basename($item)=='..')
+				continue;
+			if(substr($item,-1)==DIRECTORY_SEPARATOR)
+				self::removeDirectory($item);
+			else
+				unlink($item);
+		}
+		if(is_dir($directory))
+			rmdir($directory);
+	}
 }