diff --git a/.bandit.toml b/.bandit.toml
new file mode 100644
index 00000000..b97116fd
--- /dev/null
+++ b/.bandit.toml
@@ -0,0 +1,5 @@
+[tool.bandit]
+skips = [
+    "B404",
+    "B603",
+]
diff --git a/.bandit.yml b/.bandit.yml
deleted file mode 100644
index 66e995d0..00000000
--- a/.bandit.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-skips:
-  - B404
-  - B603
diff --git a/.pytest.ini b/.pytest.ini
deleted file mode 100644
index 053a69c7..00000000
--- a/.pytest.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[pytest]
-addopts = --cov=ahriman --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=100 --spec
-asyncio_default_fixture_loop_scope = function
-asyncio_mode = auto
-pythonpath = tests
-resource-path.directory-name-test-resources = ../../tests/testresources
-spec_test_format = {result} {docstring_summary}
diff --git a/.pytest.toml b/.pytest.toml
new file mode 100644
index 00000000..927999eb
--- /dev/null
+++ b/.pytest.toml
@@ -0,0 +1,12 @@
+[pytest]
+addopts = [
+    "--cov=ahriman",
+    "--cov-report=term-missing:skip-covered",
+    "--no-cov-on-fail",
+    "--cov-fail-under=100",
+    "--spec",
+]
+asyncio_default_fixture_loop_scope = "function"
+asyncio_mode = "auto"
+"resource-path.directory-name-test-resources" = "../../tests/testresources"
+spec_test_format = "{result} {docstring_summary}"
diff --git a/ahriman-core/tests/conftest.py b/ahriman-core/tests/ahriman/conftest.py
similarity index 100%
rename from ahriman-core/tests/conftest.py
rename to ahriman-core/tests/ahriman/conftest.py
diff --git a/ahriman-triggers/tests/conftest.py b/ahriman-triggers/tests/ahriman/conftest.py
similarity index 100%
rename from ahriman-triggers/tests/conftest.py
rename to ahriman-triggers/tests/ahriman/conftest.py
diff --git a/ahriman-web/tests/conftest.py b/ahriman-web/tests/ahriman/conftest.py
similarity index 100%
rename from ahriman-web/tests/conftest.py
rename to ahriman-web/tests/ahriman/conftest.py
diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 618ff9ba..e02656f2 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -20,9 +20,9 @@ build() {
     npm --prefix "frontend" install --cache "$srcdir/npm-cache"
     npm --prefix "frontend" run build
 
-    python -m build --wheel --no-isolation ahriman-core
-    python -m build --wheel --no-isolation ahriman-triggers
-    python -m build --wheel --no-isolation ahriman-web
+    python -m build --wheel --no-isolation "ahriman-core"
+    python -m build --wheel --no-isolation "ahriman-triggers"
+    python -m build --wheel --no-isolation "ahriman-web"
 }
 
 package_ahriman() {
diff --git a/pyproject.toml b/pyproject.toml
index 29cf86ac..6266b7e6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,9 +62,10 @@ exclude = [
     "/recipes",
     "/tools",
     "tests",
-    "/.bandit.yml",
+    "/.bandit.toml",
     "/.dockerignore",
     "/.pylint.toml",
+    "/.pytest.toml",
     "/.readthedocs.yml",
     "/conftest.py",
     "/github-logo.png",
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tox.toml b/tox.toml
index 21071dc8..03d8365c 100644
--- a/tox.toml
+++ b/tox.toml
@@ -28,7 +28,7 @@ autopep8 = [
 ]
 bandit = [
     "--configfile",
-    ".bandit.yml",
+    ".bandit.toml",
 ]
 manpage = [
     "--author",