diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 05d9c18f07b..2739994099e 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -1431,9 +1431,9 @@ QSize QAbstractScrollArea::sizeHint() const
 
     if (!d->sizeHint.isValid() || d->sizeAdjustPolicy == QAbstractScrollArea::AdjustToContents) {
         const int f = 2 * d->frameWidth;
-        const QSize frame( f, f );
-        const bool vbarHidden = d->vbar->isHidden() || d->vbarpolicy == Qt::ScrollBarAlwaysOff;
-        const bool hbarHidden = d->hbar->isHidden() || d->hbarpolicy == Qt::ScrollBarAlwaysOff;
+        const QSize frame(f, f);
+        const bool vbarHidden = !d->vbar->isVisibleTo(this) || d->vbarpolicy == Qt::ScrollBarAlwaysOff;
+        const bool hbarHidden = !d->vbar->isVisibleTo(this) || d->hbarpolicy == Qt::ScrollBarAlwaysOff;
         const QSize scrollbars(vbarHidden ? 0 : d->vbar->sizeHint().width(),
                                hbarHidden ? 0 : d->hbar->sizeHint().height());
         d->sizeHint = frame + scrollbars + viewportSizeHint();
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index cb6a05c1358..2b908d4d4f7 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -2564,8 +2564,9 @@ void tst_QListView::taskQTBUG_58749_adjustToContent()
     // use the long text and make sure the width is adjusted.
     model.setData(model.index(0, 0), longText);
     QApplication::processEvents();
-    QVERIFY(w.width() > longTextWidth);
-    QVERIFY(view->width() >= longTextWidth);
+    const QRect itemRect = view->visualRect(model.index(0, 0));
+    QVERIFY(w.width() > itemRect.width());
+    QCOMPARE_GE(view->width(), itemRect.width());
 }
 
 void tst_QListView::taskQTBUG_51086_skippingIndexesInSelectedIndexes()
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index 2892c124d6f..ce3a09c682e 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -4,6 +4,7 @@
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QMimeData>
+#include <QScrollBar>
 #include <QSignalSpy>
 #include <QTableWidget>
 #include <QTest>
@@ -1556,6 +1557,12 @@ void tst_QTableWidget::sizeHint()
     QFETCH(Qt::ScrollBarPolicy, scrollBarPolicy);
     QFETCH(QSize, viewSize);
 
+    const QString defaultStyle = QApplication::style()->name();
+    QApplication::setStyle("windows");
+    const auto resetStyle = qScopeGuard([defaultStyle]{
+        QApplication::setStyle(defaultStyle);
+    });
+
     QTableWidget view(2, 2);
     view.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
     view.setVerticalScrollBarPolicy(scrollBarPolicy);
@@ -1575,18 +1582,21 @@ void tst_QTableWidget::sizeHint()
         QTRY_COMPARE(view.size(), viewSize);
     }
 
+    QApplication::processEvents(); // execute delayed layouts
     auto sizeHint = view.sizeHint();
     view.hide();
     QCOMPARE(view.sizeHint(), sizeHint);
 
     view.horizontalHeader()->hide();
     view.show();
+    QApplication::processEvents(); // execute delayed layouts
     sizeHint = view.sizeHint();
     view.hide();
     QCOMPARE(view.sizeHint(), sizeHint);
 
     view.verticalHeader()->hide();
     view.show();
+    QApplication::processEvents(); // execute delayed layouts
     sizeHint = view.sizeHint();
     view.hide();
     QCOMPARE(view.sizeHint(), sizeHint);
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 03c36260c1f..2af2bf287d3 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -2627,6 +2627,12 @@ void tst_QTreeWidget::sizeHint()
     QFETCH(Qt::ScrollBarPolicy, scrollBarPolicy);
     QFETCH(QSize, viewSize);
 
+    const QString defaultStyle = QApplication::style()->name();
+    QApplication::setStyle("fusion");
+    const auto resetStyle = qScopeGuard([defaultStyle]{
+        QApplication::setStyle(defaultStyle);
+    });
+
     QTreeWidget view;
     view.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
     view.setVerticalScrollBarPolicy(scrollBarPolicy);
@@ -2644,6 +2650,7 @@ void tst_QTreeWidget::sizeHint()
         QTRY_COMPARE(view.size(), viewSize);
     }
 
+    QApplication::processEvents(); // execute delayed layouts
     auto sizeHint = view.sizeHint();
     view.hide();
     QCOMPARE(view.sizeHint(), sizeHint);
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
index 86c42a65228..b52782e5acb 100644
--- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
@@ -13,6 +13,7 @@
 #include <qwidget.h>
 #include <qdialog.h>
 #include <qscroller.h>
+#include <qstyle.h>
 
 class tst_QAbstractScrollArea : public QObject
 {
@@ -34,6 +35,7 @@ private slots:
 
     void margins();
     void resizeWithOvershoot();
+    void sizeHint();
 };
 
 tst_QAbstractScrollArea::tst_QAbstractScrollArea()
@@ -408,5 +410,56 @@ void tst_QAbstractScrollArea::resizeWithOvershoot()
     QTRY_COMPARE(scrollArea.viewport()->pos(), originAtRest);
 }
 
+void tst_QAbstractScrollArea::sizeHint()
+{
+    class ScrollArea : public QAbstractScrollArea
+    {
+    public:
+        QSize viewportSizeHint() const override { return {200, 200}; }
+    } scrollArea;
+    // We cannot reliable test the impact of the scrollbars on the size hint
+    // if the style uses transient scrollbars, so use the class Windows style.
+    const QString defaultStyle = QApplication::style()->name();
+    QApplication::setStyle("Windows");
+    auto resetStyle = qScopeGuard([defaultStyle]{
+        QApplication::setStyle(defaultStyle);
+    });
+    scrollArea.setFrameShape(QFrame::NoFrame);
+    scrollArea.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+    scrollArea.show();
+
+    QSize sizeHint = scrollArea.sizeHint();
+    QCOMPARE(sizeHint, scrollArea.viewportSizeHint());
+
+    scrollArea.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    scrollArea.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    const QSize sizeHintWithScrollBars = scrollArea.sizeHint();
+    QTRY_COMPARE_GT(sizeHintWithScrollBars.width(), sizeHint.width());
+    QTRY_COMPARE_GT(sizeHintWithScrollBars.height(), sizeHint.height());
+
+    sizeHint = scrollArea.sizeHint();
+
+    // whether the scroll area itself is visible or not should not influence
+    // the size hint
+    scrollArea.hide();
+    QCOMPARE(scrollArea.sizeHint(), sizeHint);
+    scrollArea.show();
+    QCOMPARE(scrollArea.sizeHint(), sizeHint);
+
+    scrollArea.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    scrollArea.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+    QCOMPARE(scrollArea.sizeHint(), scrollArea.viewportSizeHint());
+
+    scrollArea.setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    scrollArea.setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+
+    scrollArea.verticalScrollBar()->setRange(0, 1);
+    scrollArea.horizontalScrollBar()->setRange(0, 1);
+    scrollArea.resize(sizeHint / 2);
+    QApplication::processEvents(); // trigger lazy layout process
+    QCOMPARE(scrollArea.sizeHint(), sizeHintWithScrollBars);
+}
+
 QTEST_MAIN(tst_QAbstractScrollArea)
 #include "tst_qabstractscrollarea.moc"