diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlgenerator.php
index 875a7f0658..8e605d88f3 100644
--- a/tests/lib/urlgenerator.php
+++ b/tests/lib/urlgenerator.php
@@ -12,17 +12,32 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
 	/**
 	 * @small
 	 * @brief test absolute URL construction
-	 * @dataProvider provideURLs
+	 * @dataProvider provideDocRootURLs
 	 */
-	function testGetAbsoluteURL($url, $expectedResult) {
+	function testGetAbsoluteURLDocRoot($url, $expectedResult) {
 
+		\OC::$WEBROOT = '';
 		$urlGenerator = new \OC\URLGenerator(null);
 		$result = $urlGenerator->getAbsoluteURL($url);
 
 		$this->assertEquals($expectedResult, $result);
 	}
 
-	public function provideURLs() {
+	/**
+	 * @small
+	 * @brief test absolute URL construction
+	 * @dataProvider provideSubDirURLs
+	 */
+	function testGetAbsoluteURLSubDir($url, $expectedResult) {
+
+		\OC::$WEBROOT = '/owncloud';
+		$urlGenerator = new \OC\URLGenerator(null);
+		$result = $urlGenerator->getAbsoluteURL($url);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	public function provideDocRootURLs() {
 		return array(
 			array("index.php", "http://localhost/index.php"),
 			array("/index.php", "http://localhost/index.php"),
@@ -30,5 +45,14 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
 			array("apps/index.php", "http://localhost/apps/index.php"),
 			);
 	}
+
+	public function provideSubDirURLs() {
+		return array(
+			array("index.php", "http://localhost/owncloud/index.php"),
+			array("/index.php", "http://localhost/owncloud/index.php"),
+			array("/apps/index.php", "http://localhost/owncloud/apps/index.php"),
+			array("apps/index.php", "http://localhost/owncloud/apps/index.php"),
+			);
+	}
 }