diff --git a/test/clamav.bats b/test/tests/parallel/set1/clamav.bats
similarity index 100%
rename from test/clamav.bats
rename to test/tests/parallel/set1/clamav.bats
diff --git a/test/default_relay_host.bats b/test/tests/parallel/set1/default_relay_host.bats
similarity index 100%
rename from test/default_relay_host.bats
rename to test/tests/parallel/set1/default_relay_host.bats
diff --git a/test/mail_spam_bounced.bats b/test/tests/parallel/set2/spam_bounced.bats
similarity index 100%
rename from test/mail_spam_bounced.bats
rename to test/tests/parallel/set2/spam_bounced.bats
diff --git a/test/dovecot_inet_protocol.bats b/test/tests/parallel/set3/dovecot_inet_protocol.bats
similarity index 100%
rename from test/dovecot_inet_protocol.bats
rename to test/tests/parallel/set3/dovecot_inet_protocol.bats
diff --git a/test/helper-functions.bats b/test/tests/parallel/set3/helper-functions.bats
similarity index 100%
rename from test/helper-functions.bats
rename to test/tests/parallel/set3/helper-functions.bats
diff --git a/test/mail_changedetector.bats b/test/tests/serial/mail_changedetector.bats
similarity index 100%
rename from test/mail_changedetector.bats
rename to test/tests/serial/mail_changedetector.bats
diff --git a/test/mail_disabled_clamav_spamassassin.bats b/test/tests/serial/mail_disabled_clamav_spamassassin.bats
similarity index 100%
rename from test/mail_disabled_clamav_spamassassin.bats
rename to test/tests/serial/mail_disabled_clamav_spamassassin.bats
diff --git a/test/mail_dnsbl.bats b/test/tests/serial/mail_dnsbl.bats
similarity index 100%
rename from test/mail_dnsbl.bats
rename to test/tests/serial/mail_dnsbl.bats
diff --git a/test/mail_fail2ban.bats b/test/tests/serial/mail_fail2ban.bats
similarity index 100%
rename from test/mail_fail2ban.bats
rename to test/tests/serial/mail_fail2ban.bats
diff --git a/test/mail_fetchmail.bats b/test/tests/serial/mail_fetchmail.bats
similarity index 100%
rename from test/mail_fetchmail.bats
rename to test/tests/serial/mail_fetchmail.bats
diff --git a/test/mail_fetchmail_parallel.bats b/test/tests/serial/mail_fetchmail_parallel.bats
similarity index 100%
rename from test/mail_fetchmail_parallel.bats
rename to test/tests/serial/mail_fetchmail_parallel.bats
diff --git a/test/mail_hostname.bats b/test/tests/serial/mail_hostname.bats
similarity index 100%
rename from test/mail_hostname.bats
rename to test/tests/serial/mail_hostname.bats
diff --git a/test/mail_lmtp_ip.bats b/test/tests/serial/mail_lmtp_ip.bats
similarity index 100%
rename from test/mail_lmtp_ip.bats
rename to test/tests/serial/mail_lmtp_ip.bats
diff --git a/test/mail_pop3.bats b/test/tests/serial/mail_pop3.bats
similarity index 100%
rename from test/mail_pop3.bats
rename to test/tests/serial/mail_pop3.bats
diff --git a/test/mail_postfix_inet.bats b/test/tests/serial/mail_postfix_inet.bats
similarity index 100%
rename from test/mail_postfix_inet.bats
rename to test/tests/serial/mail_postfix_inet.bats
diff --git a/test/mail_postscreen.bats b/test/tests/serial/mail_postscreen.bats
similarity index 100%
rename from test/mail_postscreen.bats
rename to test/tests/serial/mail_postscreen.bats
diff --git a/test/mail_privacy.bats b/test/tests/serial/mail_privacy.bats
similarity index 100%
rename from test/mail_privacy.bats
rename to test/tests/serial/mail_privacy.bats
diff --git a/test/mail_quotas_disabled.bats b/test/tests/serial/mail_quotas_disabled.bats
similarity index 100%
rename from test/mail_quotas_disabled.bats
rename to test/tests/serial/mail_quotas_disabled.bats
diff --git a/test/mail_smtponly.bats b/test/tests/serial/mail_smtponly.bats
similarity index 100%
rename from test/mail_smtponly.bats
rename to test/tests/serial/mail_smtponly.bats
diff --git a/test/mail_spam_junk_folder.bats b/test/tests/serial/mail_spam_junk_folder.bats
similarity index 100%
rename from test/mail_spam_junk_folder.bats
rename to test/tests/serial/mail_spam_junk_folder.bats
diff --git a/test/mail_special_use_folders.bats b/test/tests/serial/mail_special_use_folders.bats
similarity index 100%
rename from test/mail_special_use_folders.bats
rename to test/tests/serial/mail_special_use_folders.bats
diff --git a/test/mail_ssl_letsencrypt.bats b/test/tests/serial/mail_ssl_letsencrypt.bats
similarity index 100%
rename from test/mail_ssl_letsencrypt.bats
rename to test/tests/serial/mail_ssl_letsencrypt.bats
diff --git a/test/mail_ssl_manual.bats b/test/tests/serial/mail_ssl_manual.bats
similarity index 100%
rename from test/mail_ssl_manual.bats
rename to test/tests/serial/mail_ssl_manual.bats
diff --git a/test/mail_time.bats b/test/tests/serial/mail_time.bats
similarity index 100%
rename from test/mail_time.bats
rename to test/tests/serial/mail_time.bats
diff --git a/test/mail_tls_dhparams.bats b/test/tests/serial/mail_tls_dhparams.bats
similarity index 100%
rename from test/mail_tls_dhparams.bats
rename to test/tests/serial/mail_tls_dhparams.bats
diff --git a/test/mail_undef_spam_subject.bats b/test/tests/serial/mail_undef_spam_subject.bats
similarity index 100%
rename from test/mail_undef_spam_subject.bats
rename to test/tests/serial/mail_undef_spam_subject.bats
diff --git a/test/mail_with_imap.bats b/test/tests/serial/mail_with_imap.bats
similarity index 100%
rename from test/mail_with_imap.bats
rename to test/tests/serial/mail_with_imap.bats
diff --git a/test/mail_with_ldap.bats b/test/tests/serial/mail_with_ldap.bats
similarity index 100%
rename from test/mail_with_ldap.bats
rename to test/tests/serial/mail_with_ldap.bats
diff --git a/test/mail_with_mdbox.bats b/test/tests/serial/mail_with_mdbox.bats
similarity index 100%
rename from test/mail_with_mdbox.bats
rename to test/tests/serial/mail_with_mdbox.bats
diff --git a/test/mail_with_postgrey.bats b/test/tests/serial/mail_with_postgrey.bats
similarity index 100%
rename from test/mail_with_postgrey.bats
rename to test/tests/serial/mail_with_postgrey.bats
diff --git a/test/mail_with_postgrey_disabled_by_default.bats b/test/tests/serial/mail_with_postgrey_disabled_by_default.bats
similarity index 100%
rename from test/mail_with_postgrey_disabled_by_default.bats
rename to test/tests/serial/mail_with_postgrey_disabled_by_default.bats
diff --git a/test/mail_with_relays.bats b/test/tests/serial/mail_with_relays.bats
similarity index 100%
rename from test/mail_with_relays.bats
rename to test/tests/serial/mail_with_relays.bats
diff --git a/test/mail_with_sdbox.bats b/test/tests/serial/mail_with_sdbox.bats
similarity index 100%
rename from test/mail_with_sdbox.bats
rename to test/tests/serial/mail_with_sdbox.bats
diff --git a/test/no_container.bats b/test/tests/serial/no_container.bats
similarity index 100%
rename from test/no_container.bats
rename to test/tests/serial/no_container.bats
diff --git a/test/open_dkim.bats b/test/tests/serial/open_dkim.bats
similarity index 100%
rename from test/open_dkim.bats
rename to test/tests/serial/open_dkim.bats
diff --git a/test/permit_docker.bats b/test/tests/serial/permit_docker.bats
similarity index 100%
rename from test/permit_docker.bats
rename to test/tests/serial/permit_docker.bats
diff --git a/test/security_tls_cipherlists.bats b/test/tests/serial/security_tls_cipherlists.bats
similarity index 100%
rename from test/security_tls_cipherlists.bats
rename to test/tests/serial/security_tls_cipherlists.bats
diff --git a/test/sedfile.bats b/test/tests/serial/sedfile.bats
similarity index 100%
rename from test/sedfile.bats
rename to test/tests/serial/sedfile.bats
diff --git a/test/setup-cli.bats b/test/tests/serial/setup-cli.bats
similarity index 100%
rename from test/setup-cli.bats
rename to test/tests/serial/setup-cli.bats
diff --git a/test/test_helper.bats b/test/tests/serial/test_helper.bats
similarity index 100%
rename from test/test_helper.bats
rename to test/tests/serial/test_helper.bats
diff --git a/test/tests.bats b/test/tests/serial/tests.bats
similarity index 100%
rename from test/tests.bats
rename to test/tests/serial/tests.bats