diff --git a/pgpainless-cli/src/test/java/org/pgpainless/cli/ExitCodeTest.java b/pgpainless-cli/src/test/java/org/pgpainless/cli/ExitCodeTest.java
index aa3d7d5b..07c9bf68 100644
--- a/pgpainless-cli/src/test/java/org/pgpainless/cli/ExitCodeTest.java
+++ b/pgpainless-cli/src/test/java/org/pgpainless/cli/ExitCodeTest.java
@@ -7,17 +7,18 @@ package org.pgpainless.cli;
 import com.ginsberg.junit.exit.ExpectSystemExitWithStatus;
 import com.ginsberg.junit.exit.FailOnSystemExit;
 import org.junit.jupiter.api.Test;
+import sop.exception.SOPGPException;
 
 public class ExitCodeTest {
 
     @Test
-    @ExpectSystemExitWithStatus(69)
+    @ExpectSystemExitWithStatus(SOPGPException.UnsupportedSubcommand.EXIT_CODE)
     public void testUnknownCommand_69() {
         PGPainlessCLI.main(new String[] {"generate-kex"});
     }
 
     @Test
-    @ExpectSystemExitWithStatus(37)
+    @ExpectSystemExitWithStatus(SOPGPException.UnsupportedOption.EXIT_CODE)
     public void testCommandWithUnknownOption_37() {
         PGPainlessCLI.main(new String[] {"generate-key", "-k", "\"k is unknown\""});
     }
diff --git a/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/DetachInbandSignatureAndMessageTest.java b/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/InlineDetachTest.java
similarity index 99%
rename from pgpainless-cli/src/test/java/org/pgpainless/cli/commands/DetachInbandSignatureAndMessageTest.java
rename to pgpainless-cli/src/test/java/org/pgpainless/cli/commands/InlineDetachTest.java
index dd7a77d2..07a212fc 100644
--- a/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/DetachInbandSignatureAndMessageTest.java
+++ b/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/InlineDetachTest.java
@@ -28,7 +28,7 @@ import org.pgpainless.cli.PGPainlessCLI;
 import org.pgpainless.cli.TestUtils;
 import sop.exception.SOPGPException;
 
-public class DetachInbandSignatureAndMessageTest {
+public class InlineDetachTest {
 
     private PrintStream originalSout;
     private static File tempDir;