diff --git a/testing/mate-image-viewer/doinst.sh b/extra/mate-image-viewer/doinst.sh
similarity index 100%
rename from testing/mate-image-viewer/doinst.sh
rename to extra/mate-image-viewer/doinst.sh
diff --git a/testing/mate-image-viewer/mate-image-viewer.SlackBuild b/extra/mate-image-viewer/mate-image-viewer.SlackBuild
similarity index 100%
rename from testing/mate-image-viewer/mate-image-viewer.SlackBuild
rename to extra/mate-image-viewer/mate-image-viewer.SlackBuild
diff --git a/testing/mate-image-viewer/slack-desc b/extra/mate-image-viewer/slack-desc
similarity index 100%
rename from testing/mate-image-viewer/slack-desc
rename to extra/mate-image-viewer/slack-desc
diff --git a/testing/mate-sensors-applet/doinst.sh b/extra/mate-sensors-applet/doinst.sh
similarity index 100%
rename from testing/mate-sensors-applet/doinst.sh
rename to extra/mate-sensors-applet/doinst.sh
diff --git a/testing/mate-sensors-applet/mate-sensors-applet.SlackBuild b/extra/mate-sensors-applet/mate-sensors-applet.SlackBuild
similarity index 100%
rename from testing/mate-sensors-applet/mate-sensors-applet.SlackBuild
rename to extra/mate-sensors-applet/mate-sensors-applet.SlackBuild
diff --git a/testing/mate-sensors-applet/slack-desc b/extra/mate-sensors-applet/slack-desc
similarity index 100%
rename from testing/mate-sensors-applet/slack-desc
rename to extra/mate-sensors-applet/slack-desc
diff --git a/mate-build-extra.sh b/mate-build-extra.sh
index 6a13050..0bcf4a4 100755
--- a/mate-build-extra.sh
+++ b/mate-build-extra.sh
@@ -43,9 +43,11 @@ for dir in \
   extra/mate-file-archiver \
   extra/mate-file-manager-open-terminal \
   extra/mate-icon-theme-faenza \
+  extra/mate-image-viewer \
   extra/mate-media \
   extra/mate-menu-editor \
   extra/mate-power-manager \
+  extra/mate-sensors=applet \
   extra/mate-terminal \
     ; do
   package=$(echo $dir | cut -f2- -d /)
diff --git a/testing/mate-build-testing.sh b/testing/mate-build-testing.sh
index 69ab6ae..b359e3e 100644
--- a/testing/mate-build-testing.sh
+++ b/testing/mate-build-testing.sh
@@ -32,10 +32,8 @@ INST=1
 TMP=${TMP:-/tmp}
 
 for package in \
-  mate-image-viewer \
   mate-netspeed \
   mate-screensaver \
-  mate-sensors-applet \
   mate-system-monitor \
   mate-text-editor \
   mate-utils \