diff --git a/ext/tidy/tests/016.phpt b/ext/tidy/tests/016.phpt
index 660b85e3373..f4f07526018 100644
--- a/ext/tidy/tests/016.phpt
+++ b/ext/tidy/tests/016.phpt
@@ -4,7 +4,8 @@ Passing configuration file through tidy_parse_file()
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
 <?php
-        $tidy = tidy_parse_file("ext/tidy/tests/016.html", "ext/tidy/tests/016.tcfg");
+	$path = dirname(__FILE__);
+        $tidy = tidy_parse_file("{$path}/016.html", "{$path}/016.tcfg");
     	tidy_clean_repair($tidy);
         echo tidy_get_output($tidy);
 ?>
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index a64d7c6444d..7a87300a7e9 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1088,7 +1088,7 @@ PHP_FUNCTION(tidy_parse_file)
 
 	if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path TSRMLS_CC))) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : "");
-		return;
+		RETURN_FALSE;
 	}
 
 	TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options);