2 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b685c817dc..b72a43d742 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,14 +2,17 @@ TEMPLATE=subdirs
 SUBDIRS=\
     qml \
     quick \
-    particles \
     qmltest \
     qmldevtools \
     cmake \
     installed_cmake \
     toolsupport
 
-qtHaveModule(widgets): SUBDIRS += quickwidgets
+qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) {
+    SUBDIRS += particles
+    qtHaveModule(widgets): SUBDIRS += quickwidgets
+
+}
 
 qmldevtools.CONFIG = host_build
 
diff --git a/tests/auto/quick/nodes/tst_nodestest.cpp b/tests/auto/quick/nodes/tst_nodestest.cpp
index 16c1174604..63e0aeb324 100644
--- a/tests/auto/quick/nodes/tst_nodestest.cpp
+++ b/tests/auto/quick/nodes/tst_nodestest.cpp
@@ -31,7 +31,6 @@
 
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QOpenGLContext>
-
 #include <QtQuick/qsgnode.h>
 #include <QtQuick/private/qsgbatchrenderer_p.h>
 #include <QtQuick/private/qsgnodeupdater_p.h>
@@ -76,7 +75,7 @@ private Q_SLOTS:
 private:
     QOffscreenSurface *surface;
     QOpenGLContext *context;
-    QSGRenderContext *renderContext;
+    QSGDefaultRenderContext *renderContext;
 };
 
 void NodesTest::initTestCase()
@@ -91,7 +90,8 @@ void NodesTest::initTestCase()
     QVERIFY(context->create());
     QVERIFY(context->makeCurrent(surface));
 
-    renderContext = renderLoop->createRenderContext(renderLoop->sceneGraphContext());
+    auto rc = renderLoop->createRenderContext(renderLoop->sceneGraphContext());
+    renderContext = static_cast<QSGDefaultRenderContext *>(rc);
     QVERIFY(renderContext);
     renderContext->initialize(context);
     QVERIFY(renderContext->isValid());
@@ -110,7 +110,7 @@ void NodesTest::cleanupTestCase()
 class DummyRenderer : public QSGBatchRenderer::Renderer
 {
 public:
-    DummyRenderer(QSGRootNode *root, QSGRenderContext *renderContext)
+    DummyRenderer(QSGRootNode *root, QSGDefaultRenderContext *renderContext)
         : QSGBatchRenderer::Renderer(renderContext)
         , changedNode(0)
         , changedState(0)