diff --git a/tests/auto/widgets/widgets/qlineedit/BLACKLIST b/tests/auto/widgets/widgets/qlineedit/BLACKLIST
index 57d56b56692..fa2fc7eaa3c 100644
--- a/tests/auto/widgets/widgets/qlineedit/BLACKLIST
+++ b/tests/auto/widgets/widgets/qlineedit/BLACKLIST
@@ -1,5 +1,3 @@
 # QTBUG-87417
-[textMargin]
-android
 [testQuickSelectionWithMouse]
 android
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 33902a3c071..aa5c1280949 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -3554,8 +3554,10 @@ void tst_QLineEdit::textMargin()
     // resizing by the window system.
     QWidget tlw;
     QLineEdit testWidget(&tlw);
-    testWidget.setGeometry(100, 100, 100, 30);
     testWidget.setText("MMM MMM MMM");
+    QFontMetrics metrics(testWidget.font());
+    const int minimumWidth =  metrics.horizontalAdvance(testWidget.text());
+    testWidget.setGeometry(100, 100, qMax(minimumWidth,  100) , 30);
     testWidget.setCursorPosition(6);
 
     QSize sizeHint = testWidget.sizeHint();