diff --git a/declarativeimports/test/gallery/Busy.qml b/declarativeimports/test/contents/ui/Busy.qml
similarity index 100%
rename from declarativeimports/test/gallery/Busy.qml
rename to declarativeimports/test/contents/ui/Busy.qml
diff --git a/declarativeimports/test/gallery/Buttons.qml b/declarativeimports/test/contents/ui/Buttons.qml
similarity index 100%
rename from declarativeimports/test/gallery/Buttons.qml
rename to declarativeimports/test/contents/ui/Buttons.qml
diff --git a/declarativeimports/test/gallery/CheckableButtons.qml b/declarativeimports/test/contents/ui/CheckableButtons.qml
similarity index 100%
rename from declarativeimports/test/gallery/CheckableButtons.qml
rename to declarativeimports/test/contents/ui/CheckableButtons.qml
diff --git a/declarativeimports/test/gallery/Gallery.qml b/declarativeimports/test/contents/ui/Gallery.qml
similarity index 96%
rename from declarativeimports/test/gallery/Gallery.qml
rename to declarativeimports/test/contents/ui/Gallery.qml
index b4f9f807e..d0aadb102 100644
--- a/declarativeimports/test/gallery/Gallery.qml
+++ b/declarativeimports/test/contents/ui/Gallery.qml
@@ -35,7 +35,6 @@ Rectangle {
         }
     }
 
-    
     ListView {
         id: pageSelector
         width: 200
@@ -77,6 +76,11 @@ Rectangle {
                 page: "Misc.qml"
                 title: "Misc stuff"
             }
+
+            ListElement {
+                page: "Locale.qml"
+                title: "Locale stuff"
+            }
         }
         delegate: ListItem {
             enabled: true
diff --git a/declarativeimports/locale/tests/contents/ui/localetest.qml b/declarativeimports/test/contents/ui/Locale.qml
similarity index 100%
rename from declarativeimports/locale/tests/contents/ui/localetest.qml
rename to declarativeimports/test/contents/ui/Locale.qml
diff --git a/declarativeimports/test/gallery/Misc.qml b/declarativeimports/test/contents/ui/Misc.qml
similarity index 100%
rename from declarativeimports/test/gallery/Misc.qml
rename to declarativeimports/test/contents/ui/Misc.qml
diff --git a/declarativeimports/test/gallery/Scrollers.qml b/declarativeimports/test/contents/ui/Scrollers.qml
similarity index 100%
rename from declarativeimports/test/gallery/Scrollers.qml
rename to declarativeimports/test/contents/ui/Scrollers.qml
diff --git a/declarativeimports/test/gallery/Sliders.qml b/declarativeimports/test/contents/ui/Sliders.qml
similarity index 100%
rename from declarativeimports/test/gallery/Sliders.qml
rename to declarativeimports/test/contents/ui/Sliders.qml
diff --git a/declarativeimports/test/gallery/TextEditing.qml b/declarativeimports/test/contents/ui/TextEditing.qml
similarity index 100%
rename from declarativeimports/test/gallery/TextEditing.qml
rename to declarativeimports/test/contents/ui/TextEditing.qml
diff --git a/declarativeimports/test/gallery/Texts.qml b/declarativeimports/test/contents/ui/Texts.qml
similarity index 100%
rename from declarativeimports/test/gallery/Texts.qml
rename to declarativeimports/test/contents/ui/Texts.qml
diff --git a/declarativeimports/locale/tests/metadata.desktop b/declarativeimports/test/metadata.desktop
similarity index 68%
rename from declarativeimports/locale/tests/metadata.desktop
rename to declarativeimports/test/metadata.desktop
index f42171738..7e0e2dbec 100644
--- a/declarativeimports/locale/tests/metadata.desktop
+++ b/declarativeimports/test/metadata.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=org.kde.example.localetest
+Name=org.kde.example.widgetgallery
 Type=Service
 X-KDE-PluginInfo-Author=Giorgos Tsiapaliwkas
 X-KDE-PluginInfo-Email=terietor@gmail.com
 X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-Name=org.kde.example.localetest
+X-KDE-PluginInfo-Name=org.kde.example.widgetgallery
 X-KDE-PluginInfo-Version=1
 X-KDE-ServiceTypes=Plasma/Applet
 X-Plasma-API=declarativeappletscript
 X-Plasma-DefaultSize=200,100
-X-Plasma-MainScript=ui/localetest.qml
+X-Plasma-MainScript=ui/Gallery.qml