diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt
index 3bbe93c21ab..f7de0d5a2bc 100644
--- a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt
@@ -179,9 +179,9 @@ class CommentSqlUtilsTest {
         val commentsInDb = generateCommentModels(60, ALL)
         val remoteComments = generateCommentModels(30, ALL)
 
-        remoteComments.removeLast()
-        remoteComments.removeLast()
-        remoteComments.removeLast()
+        remoteComments.removeAt(remoteComments.lastIndex)
+        remoteComments.removeAt(remoteComments.lastIndex)
+        remoteComments.removeAt(remoteComments.lastIndex)
 
         commentsInDb.forEach {
             CommentSqlUtils.insertOrUpdateComment(it)
@@ -239,9 +239,9 @@ class CommentSqlUtilsTest {
         val remoteComments = generateCommentModels(50, ALL)
 
         // exclude first 3 comments
-        remoteComments.removeFirst()
-        remoteComments.removeFirst()
-        remoteComments.removeFirst()
+        remoteComments.removeAt(0)
+        remoteComments.removeAt(0)
+        remoteComments.removeAt(0)
 
         commentsInDb.forEach {
             CommentSqlUtils.insertOrUpdateComment(it)