diff --git a/testing/liboobs/README b/extra/liboobs/README
similarity index 100%
rename from testing/liboobs/README
rename to extra/liboobs/README
diff --git a/testing/liboobs/liboobs.SlackBuild b/extra/liboobs/liboobs.SlackBuild
similarity index 100%
rename from testing/liboobs/liboobs.SlackBuild
rename to extra/liboobs/liboobs.SlackBuild
diff --git a/testing/liboobs/slack-desc b/extra/liboobs/slack-desc
similarity index 100%
rename from testing/liboobs/slack-desc
rename to extra/liboobs/slack-desc
diff --git a/testing/mate-system-tools/README b/extra/mate-system-tools/README
similarity index 100%
rename from testing/mate-system-tools/README
rename to extra/mate-system-tools/README
diff --git a/testing/mate-system-tools/doinst.sh b/extra/mate-system-tools/doinst.sh
similarity index 100%
rename from testing/mate-system-tools/doinst.sh
rename to extra/mate-system-tools/doinst.sh
diff --git a/testing/mate-system-tools/mate-system-tools.SlackBuild b/extra/mate-system-tools/mate-system-tools.SlackBuild
similarity index 100%
rename from testing/mate-system-tools/mate-system-tools.SlackBuild
rename to extra/mate-system-tools/mate-system-tools.SlackBuild
diff --git a/testing/mate-system-tools/slack-desc b/extra/mate-system-tools/slack-desc
similarity index 100%
rename from testing/mate-system-tools/slack-desc
rename to extra/mate-system-tools/slack-desc
diff --git a/testing/perl-net-dbus/README b/extra/perl-net-dbus/README
similarity index 100%
rename from testing/perl-net-dbus/README
rename to extra/perl-net-dbus/README
diff --git a/testing/perl-net-dbus/perl-net-dbus.SlackBuild b/extra/perl-net-dbus/perl-net-dbus.SlackBuild
similarity index 100%
rename from testing/perl-net-dbus/perl-net-dbus.SlackBuild
rename to extra/perl-net-dbus/perl-net-dbus.SlackBuild
diff --git a/testing/perl-net-dbus/slack-desc b/extra/perl-net-dbus/slack-desc
similarity index 100%
rename from testing/perl-net-dbus/slack-desc
rename to extra/perl-net-dbus/slack-desc
diff --git a/testing/perl-xml-twig/README b/extra/perl-xml-twig/README
similarity index 100%
rename from testing/perl-xml-twig/README
rename to extra/perl-xml-twig/README
diff --git a/testing/perl-xml-twig/perl-xml-twig.SlackBuild b/extra/perl-xml-twig/perl-xml-twig.SlackBuild
similarity index 100%
rename from testing/perl-xml-twig/perl-xml-twig.SlackBuild
rename to extra/perl-xml-twig/perl-xml-twig.SlackBuild
diff --git a/testing/perl-xml-twig/slack-desc b/extra/perl-xml-twig/slack-desc
similarity index 100%
rename from testing/perl-xml-twig/slack-desc
rename to extra/perl-xml-twig/slack-desc
diff --git a/testing/system-tools-backends/README b/extra/system-tools-backends/README
similarity index 100%
rename from testing/system-tools-backends/README
rename to extra/system-tools-backends/README
diff --git a/testing/system-tools-backends/services.patch b/extra/system-tools-backends/services.patch
similarity index 100%
rename from testing/system-tools-backends/services.patch
rename to extra/system-tools-backends/services.patch
diff --git a/testing/system-tools-backends/slack-desc b/extra/system-tools-backends/slack-desc
similarity index 100%
rename from testing/system-tools-backends/slack-desc
rename to extra/system-tools-backends/slack-desc
diff --git a/testing/system-tools-backends/system-tools-backends.SlackBuild b/extra/system-tools-backends/system-tools-backends.SlackBuild
similarity index 100%
rename from testing/system-tools-backends/system-tools-backends.SlackBuild
rename to extra/system-tools-backends/system-tools-backends.SlackBuild
diff --git a/mate-build-extra.sh b/mate-build-extra.sh
index 22da620..47adc6e 100755
--- a/mate-build-extra.sh
+++ b/mate-build-extra.sh
@@ -72,6 +72,11 @@ for dir in \
   deps/gtkmm \
   extra/mate-system-monitor \
   extra/mate-bluetooth \
+  perl-xml-twig \
+  perl-net-dbus \
+  system-tools-backends \
+  liboobs \
+  mate-system-tools \
   ; do
   # Get the package name
   package=$(echo $dir | cut -f2- -d /) 
diff --git a/testing/mate-build-testing.sh b/testing/mate-build-testing.sh
index cb17c52..e70eef6 100644
--- a/testing/mate-build-testing.sh
+++ b/testing/mate-build-testing.sh
@@ -40,12 +40,7 @@ MSBROOT=$(pwd)
 for dir in \
   pam \
   pam_unix2 \
-  mate-screensaver \
-  perl-xml-twig \
-  perl-net-dbus \
-  system-tools-backends \
-  liboobs \
-  mate-system-tools \
+  mate-screensaver \  
   ; do
   # Get the package name
   package=$(echo $dir | cut -f2- -d /)