diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex
index e3d75f20..2b563cae 100755
--- a/bin/fail2ban-regex
+++ b/bin/fail2ban-regex
@@ -213,7 +213,7 @@ class Fail2banRegex:
 			# Read out and set possible value of maxlines
 			try:
 				maxlines = reader.get("Init", "maxlines")
-			except NoSectionError, NoOptionError:
+			except (NoSectionError, NoOptionError):
 				# No [Init].maxlines found.
 				pass
 			else:
diff --git a/testcases/files/logs/assp b/fail2ban/tests/files/logs/assp
similarity index 100%
rename from testcases/files/logs/assp
rename to fail2ban/tests/files/logs/assp
diff --git a/testcases/files/logs/bsd/syslog-plain.txt b/fail2ban/tests/files/logs/bsd/syslog-plain.txt
similarity index 100%
rename from testcases/files/logs/bsd/syslog-plain.txt
rename to fail2ban/tests/files/logs/bsd/syslog-plain.txt
diff --git a/testcases/files/logs/bsd/syslog-v.txt b/fail2ban/tests/files/logs/bsd/syslog-v.txt
similarity index 100%
rename from testcases/files/logs/bsd/syslog-v.txt
rename to fail2ban/tests/files/logs/bsd/syslog-v.txt
diff --git a/testcases/files/logs/bsd/syslog-vv.txt b/fail2ban/tests/files/logs/bsd/syslog-vv.txt
similarity index 100%
rename from testcases/files/logs/bsd/syslog-vv.txt
rename to fail2ban/tests/files/logs/bsd/syslog-vv.txt