diff --git a/templates b/templates
index a8794ba9..cabe51fb 100755
--- a/templates
+++ b/templates
@@ -1552,12 +1552,14 @@
                       name => "install_default",
                       settings => [
                         { key => "PACKAGE_SET", value => "default" },
+                        { key => "POSTINSTALL", value => "_collect_data" },
                       ],
                     },
                     {
                       name => "install_default_upload",
                       settings => [
                         { key => "PACKAGE_SET", value => "default" },
+                        { key => "POSTINSTALL", value => "_collect_data" },
                         { key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
                       ],
                     },
@@ -1593,6 +1595,7 @@
                       name => "install_package_set_minimal",
                       settings => [
                         { key => "PACKAGE_SET", value => "minimal" },
+                        { key => "POSTINSTALL", value => "_collect_data" },
                       ],
                     },
                     {
@@ -1957,6 +1960,7 @@
                       settings => [
                         { key => "DESKTOP", value => "kde" },
                         { key => "PACKAGE_SET", value => "kde" },
+                        { key => "POSTINSTALL", value => "_collect_data" },
                         { key => "REPOSITORY_VARIATION", value => "%LOCATION%" },
                         { key => "USER_LOGIN", value => "false" },
                       ],
diff --git a/tests/_collect_data.pm b/tests/_collect_data.pm
new file mode 100644
index 00000000..d0cadc31
--- /dev/null
+++ b/tests/_collect_data.pm
@@ -0,0 +1,30 @@
+use base "installedtest";
+use strict;
+use testapi;
+
+sub run {
+    my $self = shift;
+    $self->root_console(tty=>3);
+    assert_script_run 'rpm -qa --queryformat "%{NAME}\n" | sort -u > /var/tmp/rpms.log';
+    upload_logs '/var/tmp/rpms.log';
+    assert_script_run 'free > /var/tmp/free.log';
+    upload_logs '/var/tmp/free.log';
+    assert_script_run 'df > /var/tmp/df.log';
+    upload_logs '/var/tmp/df.log';
+    assert_script_run 'systemctl -t service --no-pager |grep -o ".*\.service" > /var/tmp/services.log';
+    upload_logs '/var/tmp/services.log';
+    assert_script_run 'top -i -n20 -b > /var/tmp/top.log';
+    upload_logs '/var/tmp/top.log';
+}
+
+sub test_flags {
+    # without anything - rollback to 'lastgood' snapshot if failed
+    # 'fatal' - whole test suite is in danger if this fails
+    # 'milestone' - after this test succeeds, update 'lastgood'
+    # 'important' - if this fails, set the overall state to 'fail'
+    return {};
+}
+
+1;
+
+# vim: set sw=4 et: