diff --git a/plasmoid-tests/CMakeLists.txt b/plasmoid-tests/CMakeLists.txt
--- a/plasmoid-tests/CMakeLists.txt
+++ b/plasmoid-tests/CMakeLists.txt
@@ -14,6 +14,60 @@
     )
 endfunction()
 
+plasmoidtest(org.kde.plasma.activitybar)
+plasmoidtest(org.kde.plasma.activitypager)
 plasmoidtest(org.kde.plasma.analogclock)
+plasmoidtest(org.kde.plasma.appmenu)
+plasmoidtest(org.kde.plasma.battery)
+plasmoidtest(org.kde.plasma.binaryclock)
+plasmoidtest(org.kde.plasma.bluetooth)
+plasmoidtest(org.kde.plasma.calculator)
+plasmoidtest(org.kde.plasma.calendar)
+plasmoidtest(org.kde.plasma.clipboard)
+plasmoidtest(org.kde.plasma.colorpicker)
+plasmoidtest(org.kde.plasma.comic)
+plasmoidtest(org.kde.plasma.devicenotifier)
+plasmoidtest(org.kde.plasma.digitalclock)
+plasmoidtest(org.kde.plasma.diskquota)
+plasmoidtest(org.kde.plasma.fifteenpuzzle)
+plasmoidtest(org.kde.plasma.folder)
+plasmoidtest(org.kde.plasma.fuzzyclock)
+plasmoidtest(org.kde.plasma.grouping)
+plasmoidtest(org.kde.plasma.icon)
+plasmoidtest(org.kde.plasma.icontasks)
+plasmoidtest(org.kde.plasma.katesessions)
+plasmoidtest(org.kde.plasma.kicker)
+plasmoidtest(org.kde.plasma.kickerdash)
 plasmoidtest(org.kde.plasma.kickoff)
+plasmoidtest(org.kde.plasma.kimpanel)
+plasmoidtest(org.kde.plasma.konsoleprofiles)
+plasmoidtest(org.kde.plasma.lock_logout)
+plasmoidtest(org.kde.plasma.mediacontroller)
+plasmoidtest(org.kde.plasma.mediaframe)
+plasmoidtest(org.kde.plasma.minimizeall)
+plasmoidtest(org.kde.plasma.networkmanagement)
+plasmoidtest(org.kde.plasma.notes)
 plasmoidtest(org.kde.plasma.notifications)
+plasmoidtest(org.kde.plasma.pager)
+plasmoidtest(org.kde.plasma.panelspacer)
+plasmoidtest(org.kde.plasma.printmanager)
+plasmoidtest(org.kde.plasma.quicklaunch)
+plasmoidtest(org.kde.plasma.quickshare)
+plasmoidtest(org.kde.plasma.showActivityManager)
+plasmoidtest(org.kde.plasma.showdesktop)
+plasmoidtest(org.kde.plasma.systemloadviewer)
+plasmoidtest(org.kde.plasma.systemmonitor.cpu)
+plasmoidtest(org.kde.plasma.systemmonitor.diskactivity)
+plasmoidtest(org.kde.plasma.systemmonitor.diskusage)
+plasmoidtest(org.kde.plasma.systemmonitor.memory)
+plasmoidtest(org.kde.plasma.systemmonitor.net)
+plasmoidtest(org.kde.plasma.systemtray)
+plasmoidtest(org.kde.plasma.taskmanager)
+plasmoidtest(org.kde.plasma.timer)
+plasmoidtest(org.kde.plasma.trash)
+plasmoidtest(org.kde.plasma.userswitcher)
+plasmoidtest(org.kde.plasma.volume)
+plasmoidtest(org.kde.plasma.weather)
+plasmoidtest(org.kde.plasma.webbrowser)
+plasmoidtest(org.kde.plasma.windowlist)
+plasmoidtest(touchpad)
diff --git a/plasmoid-tests/test.sh.in b/plasmoid-tests/test.sh.in
--- a/plasmoid-tests/test.sh.in
+++ b/plasmoid-tests/test.sh.in
@@ -1,3 +1,2 @@
 #!/bin/sh
-plasmashell --test "@CMAKE_CURRENT_BINARY_DIR@/testLayout-@plasmoidName@.js"
-kactivitymanagerd stop
+plasmashell --test  "@CMAKE_CURRENT_BINARY_DIR@/testLayout-@plasmoidName@.js"
diff --git a/plasmoid-tests/testLayout.js.in b/plasmoid-tests/testLayout.js.in
--- a/plasmoid-tests/testLayout.js.in
+++ b/plasmoid-tests/testLayout.js.in
@@ -5,10 +5,9 @@
 panel.height = gridUnit * 2
 panel.addWidget(appletName)
 
-var id = createActivity("Test: "+ appletName);
-var desktopsArray = desktopsForActivity(id);
+desktopsArray = desktopsForActivity(currentActivity());
 for( var j in desktopsArray) {
     var desktop = desktopsArray[j];
     desktop.wallpaperPlugin = 'org.kde.color';
-    desktop.addWidget(appletName);
+    desktop.addWidget(appletName, 0, 100, 300, 400);
 }