diff --git a/test/test_helper/tls.bash b/test/helper/tls.bash
similarity index 100%
rename from test/test_helper/tls.bash
rename to test/helper/tls.bash
diff --git a/test/tests/parallel/set1/clamav.bats b/test/tests/parallel/set1/spam_virus/clamav.bats
similarity index 100%
rename from test/tests/parallel/set1/clamav.bats
rename to test/tests/parallel/set1/spam_virus/clamav.bats
diff --git a/test/tests/serial/mail_disabled_clamav_spamassassin.bats b/test/tests/parallel/set1/spam_virus/disabled_clamav_spamassassin.bats
similarity index 100%
rename from test/tests/serial/mail_disabled_clamav_spamassassin.bats
rename to test/tests/parallel/set1/spam_virus/disabled_clamav_spamassassin.bats
diff --git a/test/tests/serial/mail_dnsbl.bats b/test/tests/parallel/set1/spam_virus/dnsbl.bats
similarity index 100%
rename from test/tests/serial/mail_dnsbl.bats
rename to test/tests/parallel/set1/spam_virus/dnsbl.bats
diff --git a/test/tests/serial/mail_fail2ban.bats b/test/tests/parallel/set1/spam_virus/fail2ban.bats
similarity index 100%
rename from test/tests/serial/mail_fail2ban.bats
rename to test/tests/parallel/set1/spam_virus/fail2ban.bats
diff --git a/test/tests/serial/mail_with_postgrey.bats b/test/tests/parallel/set1/spam_virus/postgrey_enabled.bats
similarity index 100%
rename from test/tests/serial/mail_with_postgrey.bats
rename to test/tests/parallel/set1/spam_virus/postgrey_enabled.bats
diff --git a/test/tests/serial/mail_postscreen.bats b/test/tests/parallel/set1/spam_virus/postscreen.bats
similarity index 100%
rename from test/tests/serial/mail_postscreen.bats
rename to test/tests/parallel/set1/spam_virus/postscreen.bats
diff --git a/test/tests/parallel/set2/spam_bounced.bats b/test/tests/parallel/set1/spam_virus/spam_bounced.bats
similarity index 100%
rename from test/tests/parallel/set2/spam_bounced.bats
rename to test/tests/parallel/set1/spam_virus/spam_bounced.bats
diff --git a/test/tests/serial/mail_spam_junk_folder.bats b/test/tests/parallel/set1/spam_virus/spam_junk_folder.bats
similarity index 100%
rename from test/tests/serial/mail_spam_junk_folder.bats
rename to test/tests/parallel/set1/spam_virus/spam_junk_folder.bats
diff --git a/test/tests/serial/mail_undef_spam_subject.bats b/test/tests/parallel/set1/spam_virus/undef_spam_subject.bats
similarity index 100%
rename from test/tests/serial/mail_undef_spam_subject.bats
rename to test/tests/parallel/set1/spam_virus/undef_spam_subject.bats
diff --git a/test/tests/serial/security_tls_cipherlists.bats b/test/tests/parallel/set2/tls/tls_cipherlists.bats
similarity index 100%
rename from test/tests/serial/security_tls_cipherlists.bats
rename to test/tests/parallel/set2/tls/tls_cipherlists.bats
diff --git a/test/tests/serial/mail_ssl_letsencrypt.bats b/test/tests/parallel/set2/tls/tls_letsencrypt.bats
similarity index 100%
rename from test/tests/serial/mail_ssl_letsencrypt.bats
rename to test/tests/parallel/set2/tls/tls_letsencrypt.bats
diff --git a/test/tests/serial/mail_ssl_manual.bats b/test/tests/parallel/set2/tls/tls_manual.bats
similarity index 100%
rename from test/tests/serial/mail_ssl_manual.bats
rename to test/tests/parallel/set2/tls/tls_manual.bats