diff --git a/MANIFEST b/MANIFEST
index 98b105cf..abdc08fa 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -7,6 +7,7 @@ COPYING
 DEVELOP
 doc/run-rootless.txt
 fail2ban-2to3
+fail2ban-testcases-all-python3
 bin/fail2ban-client
 bin/fail2ban-server
 bin/fail2ban-testcases
@@ -50,17 +51,37 @@ fail2ban/tests/failmanagertestcase.py
 fail2ban/tests/clientreadertestcase.py
 fail2ban/tests/filtertestcase.py
 fail2ban/tests/__init__.py
+fail2ban/tests/dummyjail.py
+fail2ban/tests/samplestestcase.py
 fail2ban/tests/datedetectortestcase.py
 fail2ban/tests/actiontestcase.py
 fail2ban/tests/servertestcase.py
 fail2ban/tests/sockettestcase.py
 fail2ban/tests/utils.py
 fail2ban/tests/misctestcase.py
+fail2ban/tests/config/apache-auth/digest/.htaccess
+fail2ban/tests/config/apache-auth/digest/.htpasswd
+fail2ban/tests/config/apache-auth/digest_time/.htaccess
+fail2ban/tests/config/apache-auth/digest_time/.htpasswd
+fail2ban/tests/config/apache-auth/basic/authz_owner/.htaccess
+fail2ban/tests/config/apache-auth/basic/authz_owner/cant_get_me.html
+fail2ban/tests/config/apache-auth/basic/authz_owner/.htpasswd
+fail2ban/tests/config/apache-auth/basic/file/.htaccess
+fail2ban/tests/config/apache-auth/basic/file/.htpasswd
+fail2ban/tests/config/apache-auth/digest.py
+fail2ban/tests/config/apache-auth/digest_wrongrelm/.htaccess
+fail2ban/tests/config/apache-auth/digest_wrongrelm/.htpasswd
+fail2ban/tests/config/apache-auth/digest_anon/.htaccess
+fail2ban/tests/config/apache-auth/digest_anon/.htpasswd
+fail2ban/tests/config/apache-auth/README
+fail2ban/tests/config/apache-auth/noentry/.htaccess
 fail2ban/tests/files/testcase01.log
 fail2ban/tests/files/testcase02.log
 fail2ban/tests/files/testcase03.log
 fail2ban/tests/files/testcase04.log
 fail2ban/tests/files/testcase-usedns.log
+fail2ban/tests/files/testcase-journal.log
+fail2ban/tests/files/testcase-multiline.log
 fail2ban/tests/files/logs/bsd/syslog-plain.txt
 fail2ban/tests/files/logs/bsd/syslog-v.txt
 fail2ban/tests/files/logs/bsd/syslog-vv.txt
@@ -69,21 +90,48 @@ fail2ban/tests/files/logs/assp
 fail2ban/tests/files/logs/asterisk
 fail2ban/tests/files/logs/dovecot
 fail2ban/tests/files/logs/exim
-fail2ban/tests/files/logs/lighttpd
-fail2ban/tests/files/logs/mysqld.log
+fail2ban/tests/files/logs/nginx-http-auth
+fail2ban/tests/files/logs/lighttpd-auth
 fail2ban/tests/files/logs/named-refused
 fail2ban/tests/files/logs/pam-generic
 fail2ban/tests/files/logs/postfix
 fail2ban/tests/files/logs/proftpd
 fail2ban/tests/files/logs/pure-ftpd
 fail2ban/tests/files/logs/roundcube-auth
-fail2ban/tests/files/logs/sasl
 fail2ban/tests/files/logs/sogo-auth
 fail2ban/tests/files/logs/sshd
 fail2ban/tests/files/logs/sshd-ddos
 fail2ban/tests/files/logs/vsftpd
 fail2ban/tests/files/logs/webmin-auth
-fail2ban/tests/files/logs/wu-ftpd
+fail2ban/tests/files/logs/3proxy
+fail2ban/tests/files/logs/apache-auth
+fail2ban/tests/files/logs/apache-badbots
+fail2ban/tests/files/logs/apache-nohome
+fail2ban/tests/files/logs/apache-noscript
+fail2ban/tests/files/logs/courier-auth
+fail2ban/tests/files/logs/courier-smtp
+fail2ban/tests/files/logs/cyrus-imap
+fail2ban/tests/files/logs/dropbear
+fail2ban/tests/files/logs/ejabberd-auth
+fail2ban/tests/files/logs/exim-spam
+fail2ban/tests/files/logs/gssftpd
+fail2ban/tests/files/logs/guacamole
+fail2ban/tests/files/logs/lighttpd-auth
+fail2ban/tests/files/logs/mysqld-auth
+fail2ban/tests/files/logs/perdition
+fail2ban/tests/files/logs/php-url-fopen
+fail2ban/tests/files/logs/postfix-sasl
+fail2ban/tests/files/logs/qmail
+fail2ban/tests/files/logs/recidive
+fail2ban/tests/files/logs/selinux-ssh
+fail2ban/tests/files/logs/sendmail-spam
+fail2ban/tests/files/logs/sieve
+fail2ban/tests/files/logs/suhosin
+fail2ban/tests/files/logs/uwimap-auth
+fail2ban/tests/files/logs/wuftpd
+fail2ban/tests/files/logs/xinetd-fail
+fail2ban/tests/files/filter.d/testcase-common.conf
+fail2ban/tests/files/filter.d/testcase01.conf
 setup.py
 setup.cfg
 fail2ban/__init__.py
@@ -91,11 +139,6 @@ fail2ban/exceptions.py
 fail2ban/helpers.py
 fail2ban/version.py
 fail2ban/protocol.py
-fail2ban-client
-fail2ban-server
-fail2ban-testcases
-fail2ban-regex
-fail2ban-testcases-all
 setup.py
 setup.cfg
 kill-server
@@ -107,8 +150,8 @@ config/filter.d/apache-nohome.conf
 config/filter.d/apache-noscript.conf
 config/filter.d/apache-overflows.conf
 config/filter.d/nginx-http-auth.conf
-config/filter.d/courierlogin.conf
-config/filter.d/couriersmtp.conf
+config/filter.d/courier-auth.conf
+config/filter.d/courier-smtp.conf
 config/filter.d/cyrus-imap.conf
 config/filter.d/exim.conf
 config/filter.d/gssftpd.conf
@@ -145,6 +188,11 @@ config/filter.d/exim-common.conf
 config/filter.d/exim-spam.conf
 config/filter.d/perdition.conf
 config/filter.d/uwimap-auth.conf
+config/filter.d/courier-auth.conf
+config/filter.d/courier-smtp.conf
+config/filter.d/ejabberd-auth.conf
+config/filter.d/guacamole.conf
+config/filter.d/sendmail-spam.conf
 config/action.d/apf.conf
 config/action.d/osx-afctl.conf
 config/action.d/osx-ipfw.conf
diff --git a/testcases/files/logs/nginx-http-auth b/fail2ban/tests/files/logs/nginx-http-auth
similarity index 100%
rename from testcases/files/logs/nginx-http-auth
rename to fail2ban/tests/files/logs/nginx-http-auth