4 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/quick3d/3dcore/3dcore.qml b/tests/auto/quick3d/3dcore/3dcore.qml
index d0a5c6f09..664c29bc9 100644
--- a/tests/auto/quick3d/3dcore/3dcore.qml
+++ b/tests/auto/quick3d/3dcore/3dcore.qml
@@ -50,4 +50,8 @@ Item {
     QQ3Core210.Joint {}
 
     QQ3Core214.Transform {}
+
+    QQ3Core20.Attribute {}                   //Qt3DCore::QAttribute
+    QQ3Core20.Buffer {}                      //Qt3DCore::Quick::Quick3DBuffer
+    QQ3Core20.Geometry {}                    //Qt3DCore::QGeometry, Qt3DCore::Quick::Quick3DGeometry
 }
diff --git a/tests/auto/quick3d/3drender/3drender.qml b/tests/auto/quick3d/3drender/3drender.qml
index 8c200f3c0..cc0db1ab1 100644
--- a/tests/auto/quick3d/3drender/3drender.qml
+++ b/tests/auto/quick3d/3drender/3drender.qml
@@ -87,10 +87,6 @@ Item {
     QQ3Render213.SetFence {}                   //Qt3DRender::QSetFence
 
     // Geometry
-    QQ3Render20.Attribute {}                   //Qt3DRender::QAttribute
-    //QQ3Render20.BufferBase                   // (uncreatable) Qt3DRender::QBuffer
-    QQ3Render20.Buffer {}                      //Qt3DRender::Render::Quick::Quick3DBuffer
-    QQ3Render20.Geometry {}                    //Qt3DRender::QGeometry, Qt3DRender::Render::Quick::Quick3DGeometry
     QQ3Render20.GeometryRenderer {}            //Qt3DRender::QGeometryRenderer
 
     // Mesh
diff --git a/tests/auto/quick3d/quick3dbuffer/quick3dbuffer.pro b/tests/auto/quick3d/quick3dbuffer/quick3dbuffer.pro
index f36e42ff5..afcc30d19 100644
--- a/tests/auto/quick3d/quick3dbuffer/quick3dbuffer.pro
+++ b/tests/auto/quick3d/quick3dbuffer/quick3dbuffer.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 
 TARGET = tst_quick3dbuffer
 
-QT += 3dcore 3dcore-private 3drender 3drender-private 3dquick 3dquick-private 3dquickrender-private testlib
+QT += 3dcore 3dcore-private 3dquick 3dquick-private testlib
 
 CONFIG += testcase
 
diff --git a/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp b/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp
index 0392c0402..21f62ac00 100644
--- a/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp
+++ b/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp
@@ -28,7 +28,7 @@
 
 
 #include <QtTest/QTest>
-#include <Qt3DQuickRender/private/quick3dbuffer_p.h>
+#include <Qt3DQuick/private/quick3dbuffer_p.h>
 #include <QObject>
 #include <QVector3D>
 
@@ -53,7 +53,7 @@ private Q_SLOTS:
     void checkInvalidBinaryFile()
     {
         // GIVEN
-        Qt3DRender::Render::Quick::Quick3DBuffer buf;
+        Qt3DCore::Quick::Quick3DBuffer buf;
 
         // WHEN
         QVariant data = buf.readBinaryFile(QUrl::fromLocalFile(QLatin1String("this_should_not_exist.bin")));
@@ -66,7 +66,7 @@ private Q_SLOTS:
     void checkValidBinaryFile()
     {
         // GIVEN
-        Qt3DRender::Render::Quick::Quick3DBuffer buf;
+        Qt3DCore::Quick::Quick3DBuffer buf;
         QVector<QVector3D> dataArray = QVector<QVector3D>()
                 << QVector3D(327.0f, 350.0f, 355.0f)
                 << QVector3D(383.0f, 427.0f, 454.0f);