diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp
index 821deeac21a43c6424a1ff7e00acf701f7da4962..93d3968dbfcfeb248dca90939cec82c233ef81da 100644
--- a/indra/llcommon/tests/llstring_test.cpp
+++ b/indra/llcommon/tests/llstring_test.cpp
@@ -847,6 +847,9 @@ namespace tut
 		ensure_getTokens("adjacent quoted",
 						 "abc'def \"ghi'\"jkl' mno\"pqr", " ", "", "\"'",
 						 list_of("abcdef \"ghijkl' mnopqr"));
+		ensure_getTokens("quoted empty string",
+						 "--set SomeVar ''", " ", "", "'",
+						 list_of("--set")("SomeVar")(""));
 
 		// escapes
 		// Don't use backslash as an escape for these tests -- you'll go nuts