diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index 27e94d6a07..3832307897 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -205,6 +205,18 @@ class phpbb_path_helper_test extends phpbb_test_case
 				array('test' => 'xyz', 'var' => 'value'),
 				'test=xyz&var=value',
 			),
+			array(
+				array('test' => null),
+				'test',
+			),
+			array(
+				array('test' => null, 'var' => null),
+				'test&var',
+			),
+			array(
+				array('test' => 'xyz', 'var' => null, 'bar' => 'value'),
+				'test=xyz&var&bar=value',
+			),
 		);
 	}
 
@@ -254,6 +266,21 @@ class phpbb_path_helper_test extends phpbb_test_case
 				true,
 				array('base' => 'mcp.php', 'params' => array('f' => '3')),
 			),
+			array(
+				'index.php?ready',
+				false,
+				array('base' => 'index.php', 'params' => array('ready' => null)),
+			),
+			array(
+				'index.php?i=1&ready',
+				true,
+				array('base' => 'index.php', 'params' => array('i' => '1', 'ready' => null)),
+			),
+			array(
+				'index.php?ready&i=1',
+				false,
+				array('base' => 'index.php', 'params' => array('ready' => null, 'i' => '1')),
+			),
 		);
 	}