diff --git a/Cake/Controller/Component/PaginatorComponent.php b/Cake/Controller/Component/PaginatorComponent.php
index 3d9333bef95..5c46933ada3 100644
--- a/Cake/Controller/Component/PaginatorComponent.php
+++ b/Cake/Controller/Component/PaginatorComponent.php
@@ -164,7 +164,7 @@ public function paginate($object, array $settings = []) {
 		$parameters = compact('conditions', 'fields', 'order', 'limit', 'page');
 		$query = $object->find($type, array_merge($parameters, $extra));
 
-		$results = $query->execute();
+		$results = $query->all();
 		$numResults = count($results);
 
 		$defaults = $this->getDefaults($alias, $settings);
diff --git a/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php b/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
index 4eff798ea11..ee8755d6d2b 100644
--- a/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
+++ b/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -722,7 +722,7 @@ protected function _getMockPosts($methods = []) {
  * @return Query
  */
 	protected function _getMockFindQuery() {
-		$query = $this->getMock('Cake\ORM\Query', ['total', 'execute'], [], '', false);
+		$query = $this->getMock('Cake\ORM\Query', ['total', 'all'], [], '', false);
 
 		$results = $this->getMock('Cake\ORM\ResultSet', [], [], '', false);
 		$results->expects($this->any())
@@ -730,7 +730,7 @@ protected function _getMockFindQuery() {
 			->will($this->returnValue(2));
 
 		$query->expects($this->any())
-			->method('execute')
+			->method('all')
 			->will($this->returnValue($results));
 
 		$query->expects($this->any())