diff --git a/ext/standard/tests/ini_info/php_ini_loaded_file.phpt b/ext/standard/tests/ini_info/php_ini_loaded_file.phpt
index 13217f028e02..89c603fca468 100644
--- a/ext/standard/tests/ini_info/php_ini_loaded_file.phpt
+++ b/ext/standard/tests/ini_info/php_ini_loaded_file.phpt
@@ -8,7 +8,7 @@ php_ini_loaded_file() function
     $code = '"var_dump(php_ini_loaded_file());"';
 
     // No ini file ($args mays contains some)
-    passthru("$php -n -r $code");
+    passthru("$php $args -n -r $code");
 
     // Specified ini file
     passthru("$php $args -c $inifile -r $code");
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index fc62c0dd4b46..b7b0ae0f05e8 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -1266,12 +1266,19 @@ PHP_CLI_API int do_php_cli(int argc, char *argv[])
 	while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2))!=-1) {
 		switch (c) {
 			case 'c':
+				/* later -c override earlier -n */
+				ini_ignore = 0;
 				if (ini_path_override) {
 					free(ini_path_override);
 				}
 				ini_path_override = strdup(php_optarg);
 				break;
 			case 'n':
+				/* later -n override earlier -c */
+				if (ini_path_override) {
+					free(ini_path_override);
+				}
+				ini_path_override = NULL;
 				ini_ignore = 1;
 				break;
 			case 'd':