diff --git a/src/testlib/qpropertytesthelper_p.h b/src/testlib/qpropertytesthelper_p.h
index 54398278997..6bdd1feda12 100644
--- a/src/testlib/qpropertytesthelper_p.h
+++ b/src/testlib/qpropertytesthelper_p.h
@@ -22,11 +22,38 @@
 #include <private/qglobal_p.h>
 
 #include <cstdio>
+#include <memory>
+#include <optional>
 
 QT_BEGIN_NAMESPACE
 
 namespace QTestPrivate {
 
+#ifdef Q_OS_VXWORKS
+template <typename T>
+class OptionalWrapper : private std::unique_ptr<T>
+{
+    using Base = std::unique_ptr<T>;
+
+    Base &as_base() { return *this; }
+    const Base &as_base() const { return *this; }
+public:
+    Q_IMPLICIT OptionalWrapper(std::nullopt_t) : Base() {}
+
+    using Base::operator->;
+    using Base::operator*;
+    using Base::operator bool;
+
+    template <typename...Args>
+    T &emplace(Args&&...args)
+    { as_base() = std::make_unique<T>(std::forward<Args>(args)...); return **this; }
+};
+#else
+template <typename T>
+using OptionalWrapper = std::optional<T>;
+#endif // Q_OS_VXWORKS
+
+
 /*!
     \internal
 
@@ -128,9 +155,9 @@ void testReadWritePropertyBasics(
     QVERIFY2(metaProperty.isBindable() && metaProperty.isWritable(),
              "Preconditions not met for " + QByteArray(propertyName));
 
-    QScopedPointer<QSignalSpy> spy(nullptr);
+    QTestPrivate::OptionalWrapper<QSignalSpy> spy = std::nullopt;
     if (metaProperty.hasNotifySignal())
-        spy.reset(new QSignalSpy(&instance, metaProperty.notifySignal()));
+        spy.emplace(&instance, metaProperty.notifySignal());
 
     testedObj.setProperty(propertyName, QVariant::fromValue(initial));
     QPROPERTY_TEST_COMPARISON_HELPER(
@@ -321,9 +348,9 @@ void testWriteOncePropertyBasics(
 
     QUntypedBindable bindable = metaProperty.bindable(&instance);
 
-    QScopedPointer<QSignalSpy> spy(nullptr);
+    QTestPrivate::OptionalWrapper<QSignalSpy> spy = std::nullopt;
     if (metaProperty.hasNotifySignal())
-        spy.reset(new QSignalSpy(&instance, metaProperty.notifySignal()));
+        spy.emplace(&instance, metaProperty.notifySignal());
 
     QPROPERTY_TEST_COMPARISON_HELPER(
             testedObj.property(propertyName).template value<PropertyType>(), prior, comparator,
@@ -455,9 +482,9 @@ void testReadOnlyPropertyBasics(
 
     QUntypedBindable bindable = metaProperty.bindable(&instance);
 
-    QScopedPointer<QSignalSpy> spy(nullptr);
+    QTestPrivate::OptionalWrapper<QSignalSpy> spy = std::nullopt;
     if (metaProperty.hasNotifySignal())
-        spy.reset(new QSignalSpy(&instance, metaProperty.notifySignal()));
+        spy.emplace(&instance, metaProperty.notifySignal());
 
     QPROPERTY_TEST_COMPARISON_HELPER(
             testedObj.property(propertyName).template value<PropertyType>(), initial, comparator,