diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index f07d324ce1..35d82291a6 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -3197,7 +3197,8 @@ void tst_QSortFilterProxyModel::mapFromToSource()
     QCOMPARE(proxy.mapFromSource(QModelIndex()), QModelIndex());
     QCOMPARE(proxy.mapToSource(QModelIndex()), QModelIndex());
 
-#ifdef QT_NO_DEBUG  //if Qt is compiled in debug mode, this will assert
+    // Will assert in debug, so only test in release
+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
     QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapToSource");
     QCOMPARE(proxy.mapToSource(source.index(2, 3)), QModelIndex());
     QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapFromSource");
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
index 6898cf18dc..23effb60a5 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
+++ b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
@@ -115,8 +115,9 @@ void tst_QAbstractSpinBox::getSetCheck()
     QLineEdit *var3 = new QLineEdit(0);
     obj1.setLineEdit(var3);
     QCOMPARE(var3, obj1.lineEdit());
-#ifndef QT_DEBUG
-    obj1.setLineEdit((QLineEdit *)0); // Will assert in debug, so only test in release
+    // Will assert in debug, so only test in release
+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
+    obj1.setLineEdit(nullptr);
     QCOMPARE(var3, obj1.lineEdit()); // Setting 0 should keep the current editor
 #endif
     // delete var3; // No delete, since QAbstractSpinBox takes ownership