diff --git a/tests/ahriman/core/sign/gpg.py b/tests/ahriman/core/sign/gpg.py
deleted file mode 100644
index bb8def2c..00000000
--- a/tests/ahriman/core/sign/gpg.py
+++ /dev/null
@@ -1,61 +0,0 @@
-from pathlib import Path
-from pytest_mock import MockerFixture
-
-from ahriman.core.sign.gpg import GPG
-from ahriman.models.sign_settings import SignSettings
-
-
-def test_repository_sign_args(gpg: GPG) -> None:
-    """
-    must generate correct sign args
-    """
-    gpg.target = {SignSettings.SignRepository}
-    assert gpg.repository_sign_args
-
-
-def test_sign_package(gpg: GPG, mocker: MockerFixture) -> None:
-    """
-    must sign package
-    """
-    result = [Path("a"), Path("a.sig")]
-    process_mock = mocker.patch("ahriman.core.sign.gpg.process", return_value=result)
-
-    for target in ({SignSettings.SignPackages}, {SignSettings.SignPackages, SignSettings.SignRepository}):
-        gpg.target = target
-        assert gpg.sign_package(Path("a"), "a") == result
-        process_mock.assert_called_once()
-
-
-def test_sign_package_skip(gpg: GPG, mocker: MockerFixture) -> None:
-    """
-    must not sign package if it is not set
-    """
-    process_mock = mocker.patch("ahriman.core.sign.gpg.process")
-
-    for target in ({}, {SignSettings.SignRepository}):
-        gpg.target = target
-        process_mock.assert_not_called()
-
-
-def test_sign_repository(gpg: GPG, mocker: MockerFixture) -> None:
-    """
-    must sign repository
-    """
-    result = [Path("a"), Path("a.sig")]
-    process_mock = mocker.patch("ahriman.core.sign.gpg.process", return_value=result)
-
-    for target in ({SignSettings.SignRepository}, {SignSettings.SignPackages, SignSettings.SignRepository}):
-        gpg.target = target
-        assert gpg.sign_repository(Path("a")) == result
-        process_mock.assert_called_once()
-
-
-def test_sign_repository_skip(gpg: GPG, mocker: MockerFixture) -> None:
-    """
-    must not sign repository if it is not set
-    """
-    process_mock = mocker.patch("ahriman.core.sign.gpg.process")
-
-    for target in ({}, {SignSettings.SignPackages}):
-        gpg.target = target
-        process_mock.assert_not_called()
diff --git a/tests/ahriman/core/sign/test_gpg.py b/tests/ahriman/core/sign/test_gpg.py
new file mode 100644
index 00000000..6585fd26
--- /dev/null
+++ b/tests/ahriman/core/sign/test_gpg.py
@@ -0,0 +1,97 @@
+from pathlib import Path
+from pytest_mock import MockerFixture
+
+from ahriman.core.sign.gpg import GPG
+from ahriman.models.sign_settings import SignSettings
+
+
+def test_repository_sign_args(gpg: GPG) -> None:
+    """
+    must generate correct sign args
+    """
+    gpg.target = {SignSettings.SignRepository}
+    assert gpg.repository_sign_args
+
+
+def test_sign_package_1(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must sign package
+    """
+    result = [Path("a"), Path("a.sig")]
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result)
+
+    gpg.target = {SignSettings.SignPackages}
+    assert gpg.sign_package(Path("a"), "a") == result
+    process_mock.assert_called_once()
+
+
+def test_sign_package_2(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must sign package
+    """
+    result = [Path("a"), Path("a.sig")]
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result)
+
+    gpg.target = {SignSettings.SignPackages, SignSettings.SignRepository}
+    assert gpg.sign_package(Path("a"), "a") == result
+    process_mock.assert_called_once()
+
+
+def test_sign_package_skip_1(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must not sign package if it is not set
+    """
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process")
+    gpg.target = {}
+    process_mock.assert_not_called()
+
+
+def test_sign_package_skip_2(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must not sign package if it is not set
+    """
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process")
+    gpg.target = {SignSettings.SignRepository}
+    process_mock.assert_not_called()
+
+
+def test_sign_repository_1(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must sign repository
+    """
+    result = [Path("a"), Path("a.sig")]
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result)
+
+    gpg.target = {SignSettings.SignRepository}
+    assert gpg.sign_repository(Path("a")) == result
+    process_mock.assert_called_once()
+
+
+def test_sign_repository_2(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must sign repository
+    """
+    result = [Path("a"), Path("a.sig")]
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result)
+
+    gpg.target = {SignSettings.SignPackages, SignSettings.SignRepository}
+    assert gpg.sign_repository(Path("a")) == result
+    process_mock.assert_called_once()
+
+
+def test_sign_repository_skip_1(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must not sign repository if it is not set
+    """
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process")
+    gpg.target = {}
+    process_mock.assert_not_called()
+
+
+def test_sign_repository_skip_2(gpg: GPG, mocker: MockerFixture) -> None:
+    """
+    must not sign repository if it is not set
+    """
+    process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process")
+    gpg.target = {SignSettings.SignPackages}
+    process_mock.assert_not_called()