diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index d21b04c54123..cc14b26e0eb1 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -125,4 +125,13 @@ public function testBadCommand()
 		$this->assertStringContainsString('Command "bogus" not found', $result);
 	}
 
+	public function testRemapEmptyFirstParams()
+	{
+		$this->runner->_remap('anyvalue', null, 'list');
+		$result = CITestStreamFilter::$buffer;
+
+		// make sure the result looks like a command list
+		$this->assertStringContainsString('Lists the available commands.', $result);
+	}
+
 }