diff --git a/composer.json b/composer.json
index 139e1b251661..ee88efd23189 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     },
     "require": {
         "php": ">=5.4.1",
-        "doctrine/dbal": "2.5.4",
+        "doctrine/dbal": "^2.5",
         "mcnetic/zipstreamer": "^1.0",
         "phpseclib/phpseclib": "2.0.0",
         "rackspace/php-opencloud": "v1.9.2",
diff --git a/composer.lock b/composer.lock
index a30edc796506..7a2d37c54a9c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "33661e12543a109d9dbd8b3dbdee9c0b",
-    "content-hash": "6cc3a3a150511f0971bb53b0525ba392",
+    "hash": "87fbc197c16f2ebe55d804030c1be921",
+    "content-hash": "f68d46522d8a8e7eb47c93ccd76fd948",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -358,16 +358,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.5.4",
+            "version": "v2.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769"
+                "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
-                "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
+                "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
                 "shasum": ""
             },
             "require": {
@@ -376,7 +376,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "4.*",
-                "symfony/console": "2.*"
+                "symfony/console": "2.*||^3.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -425,7 +425,7 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2016-01-05 22:11:12"
+            "time": "2016-09-09 19:13:33"
         },
         {
             "name": "doctrine/inflector",
diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index de8f84ac3454..3c10d25c535c 100644
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@@ -740,7 +740,7 @@ public function testWhere($whereArguments, $expectedQueryPart, $expectedQuery) {
 		);
 
 		$this->assertSame(
-			'SELECT `column` FROM  WHERE ' . $expectedQuery,
+			'SELECT `column` WHERE ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -765,7 +765,7 @@ public function testAndWhere($whereArguments, $expectedQueryPart, $expectedQuery
 		);
 
 		$this->assertSame(
-			'SELECT `column` FROM  WHERE ' . $expectedQuery,
+			'SELECT `column` WHERE ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -797,7 +797,7 @@ public function testOrWhere($whereArguments, $expectedQueryPart, $expectedQuery)
 		);
 
 		$this->assertSame(
-			'SELECT `column` FROM  WHERE ' . $expectedQuery,
+			'SELECT `column` WHERE ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -829,7 +829,7 @@ public function testGroupBy($groupByArguments, $expectedQueryPart, $expectedQuer
 		);
 
 		$this->assertSame(
-			'SELECT `column` FROM  GROUP BY ' . $expectedQuery,
+			'SELECT `column` GROUP BY ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -862,7 +862,7 @@ public function testAddGroupBy($groupByArguments, $expectedQueryPart, $expectedQ
 		);
 
 		$this->assertSame(
-			'SELECT `column` FROM  GROUP BY ' . $expectedQuery,
+			'SELECT `column` GROUP BY ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -957,7 +957,7 @@ public function testHaving($havingArguments, $expectedQueryPart, $expectedQuery)
 		);
 
 		$this->assertSame(
-			'SELECT  FROM  ' . $expectedQuery,
+			'SELECT  ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -999,7 +999,7 @@ public function testAndHaving($havingArguments, $expectedQueryPart, $expectedQue
 		);
 
 		$this->assertSame(
-			'SELECT  FROM  ' . $expectedQuery,
+			'SELECT  ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -1041,7 +1041,7 @@ public function testOrHaving($havingArguments, $expectedQueryPart, $expectedQuer
 		);
 
 		$this->assertSame(
-			'SELECT  FROM  ' . $expectedQuery,
+			'SELECT  ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -1071,7 +1071,7 @@ public function testOrderBy($sort, $order, $expectedQueryPart, $expectedQuery) {
 		);
 
 		$this->assertSame(
-			'SELECT  FROM  ' . $expectedQuery,
+			'SELECT  ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}
@@ -1109,7 +1109,7 @@ public function testAddOrderBy($sort2, $order2, $order1, $expectedQueryPart, $ex
 		);
 
 		$this->assertSame(
-			'SELECT  FROM  ' . $expectedQuery,
+			'SELECT  ' . $expectedQuery,
 			$this->queryBuilder->getSQL()
 		);
 	}