diff --git a/test/Elastica/Bulk/ResponseSetTest.php b/test/Elastica/Bulk/ResponseSetTest.php
index 2582b2aaa5..a09d16e0f5 100644
--- a/test/Elastica/Bulk/ResponseSetTest.php
+++ b/test/Elastica/Bulk/ResponseSetTest.php
@@ -106,14 +106,6 @@ public function testIterator()
         }
 
         $this->assertFalse($responseSet->valid());
-        $this->assertNotInstanceOf(Bulk\Response::class, $responseSet->current());
-        $this->assertFalse($responseSet->current());
-
-        $responseSet->next();
-
-        $this->assertFalse($responseSet->valid());
-        $this->assertNotInstanceOf(Bulk\Response::class, $responseSet->current());
-        $this->assertFalse($responseSet->current());
 
         $responseSet->rewind();
 
@@ -126,21 +118,12 @@ public function isOkDataProvider()
     {
         list($responseData, $actions) = $this->_getFixture();
 
-        $return = [];
-        $return[] = [$responseData, $actions, true];
+        yield [$responseData, $actions, true];
         $responseData['items'][2]['index']['ok'] = false;
-        $return[] = [$responseData, $actions, false];
-
-        return $return;
+        yield [$responseData, $actions, false];
     }
 
-    /**
-     * @param array $responseData
-     * @param array $actions
-     *
-     * @return ResponseSet
-     */
-    protected function _createResponseSet(array $responseData, array $actions)
+    protected function _createResponseSet(array $responseData, array $actions): ResponseSet
     {
         $client = $this->createMock(Client::class);
 
@@ -155,10 +138,7 @@ protected function _createResponseSet(array $responseData, array $actions)
         return $bulk->send();
     }
 
-    /**
-     * @return array
-     */
-    protected function _getFixture()
+    protected function _getFixture(): array
     {
         $responseData = [
             'took' => 5,
diff --git a/test/Elastica/QueryTest.php b/test/Elastica/QueryTest.php
index 1fc7bcdeb7..7c267fa7f8 100644
--- a/test/Elastica/QueryTest.php
+++ b/test/Elastica/QueryTest.php
@@ -119,7 +119,8 @@ public function testSetSort()
         $this->assertEquals(2, $resultSet->count());
 
         $first = $resultSet->current()->getData();
-        $second = $resultSet->next()->getData();
+        $resultSet->next();
+        $second = $resultSet->current()->getData();
 
         $this->assertEquals('guschti', $first['firstname']);
         $this->assertEquals('nicolas', $second['firstname']);
@@ -130,7 +131,8 @@ public function testSetSort()
         $this->assertEquals(2, $resultSet->count());
 
         $first = $resultSet->current()->getData();
-        $second = $resultSet->next()->getData();
+        $resultSet->next();
+        $second = $resultSet->current()->getData();
 
         $this->assertEquals('nicolas', $first['firstname']);
         $this->assertEquals('guschti', $second['firstname']);