diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 4a13ee3ee9c..a90f5c96477 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -96,6 +96,13 @@ add_qtc_library(QmlDesignerCore STATIC
   SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore
   SOURCES
     rewritertransaction.cpp rewritertransaction.h
+
+)
+
+extend_qtc_library(QmlDesignerCore
+  PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/designercoreutils
+  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/designercoreutils
+  SOURCES
     generatedcomponentutils.cpp generatedcomponentutils.h
     uniquename.cpp uniquename.h
 )
@@ -521,6 +528,7 @@ add_qtc_plugin(QmlDesigner
     ${CMAKE_CURRENT_LIST_DIR}
     ${CMAKE_CURRENT_LIST_DIR}/designercore #can not be a public dependency -> EXCLUDE_FROM_INSTALL in QmlDesignerCore
     ${CMAKE_CURRENT_LIST_DIR}/designercore/include #iwidgetplugin.h is used by other plugins
+    ${CMAKE_CURRENT_LIST_DIR}/designercore/designercoreutils
   SOURCES
     designmodecontext.cpp designmodecontext.h
     designmodewidget.cpp designmodewidget.h
diff --git a/src/plugins/qmldesigner/designercore/generatedcomponentutils.cpp b/src/plugins/qmldesigner/designercore/designercoreutils/generatedcomponentutils.cpp
similarity index 100%
rename from src/plugins/qmldesigner/designercore/generatedcomponentutils.cpp
rename to src/plugins/qmldesigner/designercore/designercoreutils/generatedcomponentutils.cpp
diff --git a/src/plugins/qmldesigner/designercore/generatedcomponentutils.h b/src/plugins/qmldesigner/designercore/designercoreutils/generatedcomponentutils.h
similarity index 100%
rename from src/plugins/qmldesigner/designercore/generatedcomponentutils.h
rename to src/plugins/qmldesigner/designercore/designercoreutils/generatedcomponentutils.h
diff --git a/src/plugins/qmldesigner/designercore/uniquename.cpp b/src/plugins/qmldesigner/designercore/designercoreutils/uniquename.cpp
similarity index 100%
rename from src/plugins/qmldesigner/designercore/uniquename.cpp
rename to src/plugins/qmldesigner/designercore/designercoreutils/uniquename.cpp
diff --git a/src/plugins/qmldesigner/designercore/uniquename.h b/src/plugins/qmldesigner/designercore/designercoreutils/uniquename.h
similarity index 100%
rename from src/plugins/qmldesigner/designercore/uniquename.h
rename to src/plugins/qmldesigner/designercore/designercoreutils/uniquename.h
diff --git a/src/plugins/qmldesigner/documentmanager.h b/src/plugins/qmldesigner/documentmanager.h
index 64476943391..59ec00b7979 100644
--- a/src/plugins/qmldesigner/documentmanager.h
+++ b/src/plugins/qmldesigner/documentmanager.h
@@ -5,7 +5,7 @@
 
 #include "qmldesigner_global.h"
 
-#include <generatedcomponentutils.h>
+#include <designercoreutils/generatedcomponentutils.h>
 
 #include <QObject>
 #include <QList>
diff --git a/tests/unit/tests/testdesignercore/CMakeLists.txt b/tests/unit/tests/testdesignercore/CMakeLists.txt
index 423ce7ff8a5..3bc52fd2e1c 100644
--- a/tests/unit/tests/testdesignercore/CMakeLists.txt
+++ b/tests/unit/tests/testdesignercore/CMakeLists.txt
@@ -18,6 +18,7 @@ add_qtc_library(TestDesignerCore OBJECT
     ${QmlDesignerDir}/designercore
     ${QmlDesignerDir}/designercore/include
     ${QmlDesignerDir}/designercore/imagecache
+    ${QmlDesignerDir}/designercore/designercoreutils
   PUBLIC_DEFINES
     UNIT_TESTS
     DONT_CHECK_MESSAGE_COUNTER
@@ -150,8 +151,8 @@ add_qtc_library(TestDesignerCore OBJECT
     tracing/qmldesignertracing.cpp tracing/qmldesignertracing.h
     rewritertransaction.cpp
     rewritertransaction.h
-    uniquename.cpp
-    uniquename.h
+    designercoreutils/uniquename.cpp
+    designercoreutils/uniquename.h
 )
 
 extend_qtc_library(TestDesignerCore
diff --git a/tests/unit/tests/unittests/CMakeLists.txt b/tests/unit/tests/unittests/CMakeLists.txt
index 77cf7a716cd..0c5f8bfd5ed 100644
--- a/tests/unit/tests/unittests/CMakeLists.txt
+++ b/tests/unit/tests/unittests/CMakeLists.txt
@@ -45,6 +45,7 @@ function(unittest_copy_data_folder)
 endfunction(unittest_copy_data_folder)
 
 add_subdirectory(componentcore)
+add_subdirectory(designercoreutils)
 add_subdirectory(listmodeleditor)
 add_subdirectory(imagecache)
 add_subdirectory(metainfo)
diff --git a/tests/unit/tests/unittests/designercoreutils/CMakeLists.txt b/tests/unit/tests/unittests/designercoreutils/CMakeLists.txt
new file mode 100644
index 00000000000..ac92e5a31c1
--- /dev/null
+++ b/tests/unit/tests/unittests/designercoreutils/CMakeLists.txt
@@ -0,0 +1,5 @@
+# qmldesigner/designercore/model
+extend_qtc_test(unittest
+  SOURCES
+    uniquename-test.cpp
+)
diff --git a/tests/unit/tests/unittests/model/uniquename-test.cpp b/tests/unit/tests/unittests/designercoreutils/uniquename-test.cpp
similarity index 100%
rename from tests/unit/tests/unittests/model/uniquename-test.cpp
rename to tests/unit/tests/unittests/designercoreutils/uniquename-test.cpp
diff --git a/tests/unit/tests/unittests/model/CMakeLists.txt b/tests/unit/tests/unittests/model/CMakeLists.txt
index 08b2a7daa59..dfd6107b14c 100644
--- a/tests/unit/tests/unittests/model/CMakeLists.txt
+++ b/tests/unit/tests/unittests/model/CMakeLists.txt
@@ -8,5 +8,4 @@ extend_qtc_test(unittest
     modelresourcemanagement-test.cpp
     modelutils-test.cpp
     nodelistproperty-test.cpp
-    uniquename-test.cpp
 )