diff --git a/gb-command-test/src/test/java/com/g2forge/gearbox/command/test/TestExitCode.java b/gb-command-test/src/test/java/com/g2forge/gearbox/command/test/TestExitCode.java
new file mode 100644
index 0000000..80497b6
--- /dev/null
+++ b/gb-command-test/src/test/java/com/g2forge/gearbox/command/test/TestExitCode.java
@@ -0,0 +1,56 @@
+package com.g2forge.gearbox.command.test;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+import com.g2forge.alexandria.command.clireport.HCLIReport;
+import com.g2forge.alexandria.java.core.helpers.HCollector;
+import com.g2forge.alexandria.test.HAssert;
+import com.g2forge.gearbox.command.converter.ICommandConverterR_;
+import com.g2forge.gearbox.command.converter.dumb.Command;
+import com.g2forge.gearbox.command.converter.dumb.DumbCommandConverter;
+import com.g2forge.gearbox.command.converter.dumb.EnvPath;
+
+public class TestExitCode extends ATestCommand {
+	public interface IGenericCommand extends ITestCommandInterface {
+		@Command({})
+		public Stream<String> run(@EnvPath(usage = EnvPath.Usage.AddFirst) Path path, String filename, String... args);
+	}
+
+	@Override
+	protected ICommandConverterR_ createRenderer() {
+		return DumbCommandConverter.create();
+	}
+
+	protected boolean isValid() {
+		// Don't run the generic exit code test
+		return false;
+	}
+
+	@Test
+	public void one() {
+		final Path clireport = HCLIReport.download(null).get().toAbsolutePath();
+		final String[] arguments = new String[] { "--exit", "1", "A", "B" };
+		try {
+			getFactory().apply(IGenericCommand.class).run(null, clireport.toString(), arguments).collect(Collectors.toList());
+		} catch (RuntimeException e) {
+			final List<String> lines = HCLIReport.computeExpectedOutput(clireport.toString(), arguments);
+			final String message = String.format("Showing last %1$d lines of output:\n", lines.size()) + lines.stream().map(s -> "\t" + s).collect(HCollector.joining("\n")) + "\n";
+			HAssert.assertEquals(message, e.getMessage());
+			return;
+		}
+		HAssert.fail();
+	}
+
+	@Test
+	public void zero() {
+		final Path clireport = HCLIReport.download(null).get().toAbsolutePath();
+		final String[] arguments = new String[] { "--exit", "0", "A", "B" };
+		final List<String> actual = getFactory().apply(IGenericCommand.class).run(null, clireport.toString(), arguments).collect(Collectors.toList());
+		HAssert.assertEquals(HCLIReport.computeExpectedOutput(clireport.toString(), arguments), actual);
+	}
+}