diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/CommentsHistoryBlock.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/CommentsHistoryBlock.php
index 2ddde205394790809af16bd93b87aa45173a41ff..ce36ae7324cac639e46e72c85fa81c26c79f2244 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/CommentsHistoryBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/CommentsHistoryBlock.php
@@ -65,11 +65,13 @@ class CommentsHistoryBlock extends Block
         $result = [];
         $elements = $this->_rootElement->getElements($this->commentHistory);
         foreach ($elements as $key => $item) {
-            $result[$key]['date'] = $item->find($this->commentHistoryDate)->getText();
-            $result[$key]['time'] = $item->find($this->commentHistoryTime)->getText();
-            $result[$key]['status'] = $item->find($this->commentHistoryStatus)->getText();
-            $result[$key]['is_customer_notified'] = $item->find($this->commentHistoryNotifiedStatus)->getText();
-            $result[$key]['comment'] = $item->find($this->comment)->getText();
+            $result[$key] = [
+                'date' => $item->find($this->commentHistoryDate)->getText(),
+                'time' => $item->find($this->commentHistoryTime)->getText(),
+                'status' => $item->find($this->commentHistoryStatus)->getText(),
+                'is_customer_notified' => $item->find($this->commentHistoryNotifiedStatus)->getText(),
+                'comment' => $item->find($this->comment)->getText()
+            ];
         }
 
         return $result;
@@ -83,6 +85,6 @@ class CommentsHistoryBlock extends Block
     public function getLatestComment()
     {
         $comments = $this->getComments();
-        return end($comments);
+        return current($comments);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
index 14379c279fedcfde5a8ff60eed82a48e102a5fae..246f440eb04f93b2fde14ce58d6b07e9a48a0da2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Test\Constraint;
 
-use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;