diff --git a/ext/fileinfo/tests/finfo_buffer_basic_charset-mb.phpt b/ext/fileinfo/tests/finfo_buffer_basic_charset-mb.phpt
new file mode 100644
index 0000000000000..b72e6749ac2ab
--- /dev/null
+++ b/ext/fileinfo/tests/finfo_buffer_basic_charset-mb.phpt
@@ -0,0 +1,57 @@
+--TEST--
+Test finfo_buffer() function : basic functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+/* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
+ * Description: Return infromation about a string buffer. 
+ * Source code: ext/fileinfo/fileinfo.c
+ * Alias to functions: 
+ */
+
+$magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magicАБВГДЕЖЗИЙКЛМНОПF';
+
+$options = array(
+	FILEINFO_NONE,
+	FILEINFO_MIME,
+);
+
+$buffers = array(
+	"Regular string here",
+	"\177ELF",
+	"\000\000\0001\000\000\0000\000\000\0000\000\000\0002\000\000\0000\000\000\0000\000\000\0003",
+	"\x55\x7A\x6E\x61",
+	"id=ImageMagick",
+	"RIFFüîò^BAVI LISTv",
+);
+
+echo "*** Testing finfo_buffer() : basic functionality ***\n";
+
+foreach( $options as $option ) {
+	$finfo = finfo_open( $option, $magicFile );
+	foreach( $buffers as $string ) {
+		var_dump( finfo_buffer( $finfo, $string, $option ) );
+	}
+	finfo_close( $finfo );
+}
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing finfo_buffer() : basic functionality ***
+string(36) "ASCII text, with no line terminators"
+string(3) "ELF"
+string(22) "old ACE/gr binary file"
+string(12) "xo65 object,"
+string(15) "MIFF image data"
+string(25) "RIFF (little-endian) data"
+string(28) "text/plain; charset=us-ascii"
+string(26) "text/plain; charset=ebcdic"
+string(40) "application/octet-stream; charset=binary"
+string(28) "text/plain; charset=us-ascii"
+string(28) "text/plain; charset=us-ascii"
+string(25) "text/plain; charset=utf-8"
+===DONE===
diff --git a/ext/gd/tests/001_charset-mb.phpt b/ext/gd/tests/001_charset-mb.phpt
new file mode 100644
index 0000000000000..071150890af04
--- /dev/null
+++ b/ext/gd/tests/001_charset-mb.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imagecreatefrompng() and empty/missing file
+--SKIPIF--
+<?php if (!function_exists("imagecreatefrompng")) print "skip"; ?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+
+$file = dirname(__FILE__)."/001АБВГДЕЖЗИЙКЛМНОПF.test";
+@unlink($file);
+
+var_dump(imagecreatefrompng($file));
+touch($file);
+var_dump(imagecreatefrompng($file));
+
+@unlink($file);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: imagecreatefrompng(%s001АБВГДЕЖЗИЙКЛМНОПF.test): failed to open stream: No such file or directory in %s on line %d
+bool(false)
+
+Warning: imagecreatefrompng(): '%s001АБВГДЕЖЗИЙКЛМНОПF.test' is not a valid PNG file in %s on line %d
+bool(false)
+Done
diff --git a/ext/phar/tests/phar_extract-mb.phpt b/ext/phar/tests/phar_extract-mb.phpt
new file mode 100644
index 0000000000000..e938d1edc0214
--- /dev/null
+++ b/ext/phar/tests/phar_extract-mb.phpt
@@ -0,0 +1,150 @@
+--TEST--
+Phar: Phar::extractTo()
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.readonly=0
+--FILE--
+<?php
+
+$fname = dirname(__FILE__) . '/tempmanifest1.phar.php';
+$pname = 'phar://' . $fname;
+
+$a = new Phar($fname);
+$a['file1.txt'] = 'hi';
+$a['file2.txt'] = 'hi2';
+$a['subdir/ectory/file.txt'] = 'hi3';
+$a->mount($pname . '/mount', __FILE__);
+$a->addEmptyDir('one/level');
+
+$a->extractTo(dirname(__FILE__) . '/extractАБВГДЕЖЗИЙКЛМНОПF', 'mount');
+$a->extractTo(dirname(__FILE__) . '/extractАБВГДЕЖЗИЙКЛМНОПF');
+
+$out = array();
+
+foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__) . '/extractАБВГДЕЖЗИЙКЛМНОПF', 0x00003000), RecursiveIteratorIterator::CHILD_FIRST) as $p => $b) {
+	$out[] = $p;
+}
+
+sort($out);
+
+foreach ($out as $b) {
+	echo "$b\n";
+}
+
+$a->extractTo(dirname(__FILE__) . '/extract1', 'file1.txt');
+var_dump(file_get_contents(dirname(__FILE__) . '/extract1/file1.txt'));
+
+$a->extractTo(dirname(__FILE__) . '/extract1', 'subdir/ectory/file.txt');
+var_dump(file_get_contents(dirname(__FILE__) . '/extract1/subdir/ectory/file.txt'));
+
+$a->extractTo(dirname(__FILE__) . '/extract1-2', array('file2.txt', 'one/level'));
+var_dump(file_get_contents(dirname(__FILE__) . '/extract1-2/file2.txt'));
+var_dump(is_dir(dirname(__FILE__) . '/extract1-2/one/level'));
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/whatever', 134);
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+$a->extractTo(array());
+
+try {
+	$a->extractTo('');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+file_put_contents(dirname(__FILE__) . '/oops', 'I is file');
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/oops', 'file1.txt');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/oops1', array(array(), 'file1.txt'));
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/extract', 'file1.txt');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+file_put_contents(dirname(__FILE__) . '/extract/file1.txt', 'first');
+var_dump(file_get_contents(dirname(__FILE__) . '/extract/file1.txt'));
+
+$a->extractTo(dirname(__FILE__) . '/extract', 'file1.txt', true);
+var_dump(file_get_contents(dirname(__FILE__) . '/extract/file1.txt'));
+
+try {
+	$a->extractTo(str_repeat('a', 20000), 'file1.txt');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+$a[str_repeat('a', 20000)] = 'long';
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/extract', str_repeat('a', 20000));
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+?>
+===DONE===
+--CLEAN--
+<?php
+@rmdir(dirname(__FILE__) . '/whatever');
+@unlink(dirname(__FILE__) . '/oops');
+@rmdir(dirname(__FILE__) . '/oops1');
+@unlink(dirname(__FILE__) . '/tempmanifest1.phar.php');
+$e = dirname(__FILE__) . '/extract/';
+@unlink($e . 'file1.txt');
+@unlink($e . 'file2.txt');
+@unlink($e . 'subdir/ectory/file.txt');
+@rmdir($e . 'subdir/ectory');
+@rmdir($e . 'subdir');
+@rmdir($e . 'one/level');
+@rmdir($e . 'one');
+@rmdir($e);
+$e = dirname(__FILE__) . '/extract1/';
+@unlink($e . 'file1.txt');
+@unlink($e . 'subdir/ectory/file.txt');
+@rmdir($e . 'subdir/ectory');
+@rmdir($e . 'subdir');
+@rmdir($e);
+$e = dirname(__FILE__) . '/extract1-2/';
+@unlink($e . 'file2.txt');
+@rmdir($e . 'one/level');
+@rmdir($e . 'one');
+@rmdir($e);
+?>
+--EXPECTF--
+%sextract%cfile1.txt
+%sextract%cfile2.txt
+%sextract%cone
+%sextract%csubdir
+%sextract%csubdir%cectory
+%sextract%csubdir%cectory%cfile.txt
+string(2) "hi"
+string(3) "hi3"
+string(3) "hi2"
+bool(false)
+Invalid argument, expected a filename (string) or array of filenames
+
+Warning: Phar::extractTo() expects parameter 1 to be a valid path, array given in %sphar_extract.php on line %d
+Invalid argument, extraction path must be non-zero length
+Unable to use path "%soops" for extraction, it is a file, must be a directory
+Invalid argument, array of filenames to extract contains non-string value
+Extraction from phar "%stempmanifest1.phar.php" failed: Cannot extract "file1.txt" to "%sextract/file1.txt", path already exists
+string(5) "first"
+string(2) "hi"
+Cannot extract to "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...", destination directory is too long for filesystem
+Extraction from phar "%stempmanifest1.phar.php" failed: Cannot extract "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..." to "%s...", extracted filename is too long for filesystem
+===DONE===
diff --git a/ext/phar/tests/phar_extract_charset-mb.phpt b/ext/phar/tests/phar_extract_charset-mb.phpt
new file mode 100644
index 0000000000000..305f7278f131f
--- /dev/null
+++ b/ext/phar/tests/phar_extract_charset-mb.phpt
@@ -0,0 +1,151 @@
+--TEST--
+Phar: Phar::extractTo()
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.readonly=0
+default_charset=cp1251
+--FILE--
+<?php
+
+$fname = dirname(__FILE__) . '/tempmanifest1АБВГДЕЖЗИЙКЛМНОПF.phar.php';
+$pname = 'phar://' . $fname;
+
+$a = new Phar($fname);
+$a['file1.txt'] = 'hi';
+$a['file2.txt'] = 'hi2';
+$a['subdir/ectory/file.txt'] = 'hi3';
+$a->mount($pname . '/mount', __FILE__);
+$a->addEmptyDir('one/level');
+
+$a->extractTo(dirname(__FILE__) . '/extract', 'mount');
+$a->extractTo(dirname(__FILE__) . '/extract');
+
+$out = array();
+
+foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__) . '/extract', 0x00003000), RecursiveIteratorIterator::CHILD_FIRST) as $p => $b) {
+	$out[] = $p;
+}
+
+sort($out);
+
+foreach ($out as $b) {
+	echo "$b\n";
+}
+
+$a->extractTo(dirname(__FILE__) . '/extract1', 'file1.txt');
+var_dump(file_get_contents(dirname(__FILE__) . '/extract1/file1.txt'));
+
+$a->extractTo(dirname(__FILE__) . '/extract1', 'subdir/ectory/file.txt');
+var_dump(file_get_contents(dirname(__FILE__) . '/extract1/subdir/ectory/file.txt'));
+
+$a->extractTo(dirname(__FILE__) . '/extract1-2', array('file2.txt', 'one/level'));
+var_dump(file_get_contents(dirname(__FILE__) . '/extract1-2/file2.txt'));
+var_dump(is_dir(dirname(__FILE__) . '/extract1-2/one/level'));
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/whatever', 134);
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+$a->extractTo(array());
+
+try {
+	$a->extractTo('');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+file_put_contents(dirname(__FILE__) . '/oops', 'I is file');
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/oops', 'file1.txt');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/oops1', array(array(), 'file1.txt'));
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/extract', 'file1.txt');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+file_put_contents(dirname(__FILE__) . '/extract/file1.txt', 'first');
+var_dump(file_get_contents(dirname(__FILE__) . '/extract/file1.txt'));
+
+$a->extractTo(dirname(__FILE__) . '/extract', 'file1.txt', true);
+var_dump(file_get_contents(dirname(__FILE__) . '/extract/file1.txt'));
+
+try {
+	$a->extractTo(str_repeat('a', 20000), 'file1.txt');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+$a[str_repeat('a', 20000)] = 'long';
+
+try {
+	$a->extractTo(dirname(__FILE__) . '/extract', str_repeat('a', 20000));
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+?>
+===DONE===
+--CLEAN--
+<?php
+@rmdir(dirname(__FILE__) . '/whatever');
+@unlink(dirname(__FILE__) . '/oops');
+@rmdir(dirname(__FILE__) . '/oops1');
+@unlink(dirname(__FILE__) . '/tempmanifest1АБВГДЕЖЗИЙКЛМНОПF.phar.php');
+$e = dirname(__FILE__) . '/extract/';
+@unlink($e . 'file1.txt');
+@unlink($e . 'file2.txt');
+@unlink($e . 'subdir/ectory/file.txt');
+@rmdir($e . 'subdir/ectory');
+@rmdir($e . 'subdir');
+@rmdir($e . 'one/level');
+@rmdir($e . 'one');
+@rmdir($e);
+$e = dirname(__FILE__) . '/extract1/';
+@unlink($e . 'file1.txt');
+@unlink($e . 'subdir/ectory/file.txt');
+@rmdir($e . 'subdir/ectory');
+@rmdir($e . 'subdir');
+@rmdir($e);
+$e = dirname(__FILE__) . '/extract1-2/';
+@unlink($e . 'file2.txt');
+@rmdir($e . 'one/level');
+@rmdir($e . 'one');
+@rmdir($e);
+?>
+--EXPECTF--
+%sextract%cfile1.txt
+%sextract%cfile2.txt
+%sextract%cone
+%sextract%csubdir
+%sextract%csubdir%cectory
+%sextract%csubdir%cectory%cfile.txt
+string(2) "hi"
+string(3) "hi3"
+string(3) "hi2"
+bool(false)
+Invalid argument, expected a filename (string) or array of filenames
+
+Warning: Phar::extractTo() expects parameter 1 to be a valid path, array given in %sphar_extract.php on line %d
+Invalid argument, extraction path must be non-zero length
+Unable to use path "%soops" for extraction, it is a file, must be a directory
+Invalid argument, array of filenames to extract contains non-string value
+Extraction from phar "%stempmanifestАБВГДЕЖЗИЙКЛМНОПF1.phar.php" failed: Cannot extract "file1.txt" to "%sextract/file1.txt", path already exists
+string(5) "first"
+string(2) "hi"
+Cannot extract to "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...", destination directory is too long for filesystem
+Extraction from phar "%stempmanifestАБВГДЕЖЗИЙКЛМНОПF1.phar.php" failed: Cannot extract "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..." to "%s...", extracted filename is too long for filesystem
+===DONE===
diff --git a/ext/phar/tests/tar/bignames_overflow-mb.phpt b/ext/phar/tests/tar/bignames_overflow-mb.phpt
new file mode 100644
index 0000000000000..c0595720ef348
--- /dev/null
+++ b/ext/phar/tests/tar/bignames_overflow-mb.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Phar: tar with huge filenames, buffer overflow
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
+--FILE--
+<?php
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
+$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.tar';
+$pname = 'phar://' . $fname;
+
+include dirname(__FILE__) . '/files/make.dangerous.tar.php.inc';
+
+$tar = new danger_tarmaker($fname, 'none');
+$tar->init();
+$tar->addFile('АБВГДЕЖЗИЙКЛМНОПF'.str_repeat('a', 101), 'hi');
+$tar->addFile('АБВГДЕЖЗИЙКЛМНОПF'.str_repeat('a', 255), 'hi2');
+$tar->close();
+
+$p1 = new PharData($fname);
+foreach ($p1 as $file) {
+	echo $file->getFileName(), "\n";
+}
+echo $p1['a/' . str_repeat('a', 100)]->getContent() . "\n";
+echo $p1[str_repeat('a', 155) . '/' . str_repeat('a', 100)]->getContent() . "\n";
+
+?>
+===DONE===
+--CLEAN--
+<?php
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar');
+?>
+--EXPECT--
+АБВГДЕЖЗИЙКЛМНОПFa
+АБВГДЕЖЗИЙКЛМНОПFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+hi
+hi2
+===DONE===
diff --git a/ext/phar/tests/tar/bignames_overflow_charset-mb.phpt b/ext/phar/tests/tar/bignames_overflow_charset-mb.phpt
new file mode 100644
index 0000000000000..c9d694b3b1947
--- /dev/null
+++ b/ext/phar/tests/tar/bignames_overflow_charset-mb.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Phar: tar with huge filenames, buffer overflow
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
+default_charset=cp1251
+--FILE--
+<?php
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
+$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.tar';
+$pname = 'phar://' . $fname;
+
+include dirname(__FILE__) . '/files/make.dangerous.tar.php.inc';
+
+$tar = new danger_tarmaker($fname, 'none');
+$tar->init();
+$tar->addFile('АБВГДЕЖЗИЙКЛМНОПF'.str_repeat('a', 101), 'hi');
+$tar->addFile('АБВГДЕЖЗИЙКЛМНОПF'.str_repeat('a', 255), 'hi2');
+$tar->close();
+
+$p1 = new PharData($fname);
+foreach ($p1 as $file) {
+	echo $file->getFileName(), "\n";
+}
+echo $p1['a/' . str_repeat('a', 100)]->getContent() . "\n";
+echo $p1[str_repeat('a', 155) . '/' . str_repeat('a', 100)]->getContent() . "\n";
+
+?>
+===DONE===
+--CLEAN--
+<?php
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar');
+?>
+--EXPECT--
+АБВГДЕЖЗИЙКЛМНОПFa
+АБВГДЕЖЗИЙКЛМНОПFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+hi
+hi2
+===DONE===
diff --git a/ext/phar/tests/tar/rename-charset_mb.phpt b/ext/phar/tests/tar/rename-charset_mb.phpt
new file mode 100644
index 0000000000000..51bc4d68afb61
--- /dev/null
+++ b/ext/phar/tests/tar/rename-charset_mb.phpt
@@ -0,0 +1,43 @@
+--TEST--
+Phar: rename test tar-based
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.readonly=0
+phar.require_hash=0
+default_charset=cp1251
+--FILE--
+<?php
+include dirname(__FILE__) . '/files/tarmaker.php.inc';
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . 'АБВГДЕЖЗИЙКЛМНОПF.phar.tar';
+$alias = 'phar://' . $fname;
+
+$tar = new tarmaker($fname, 'none');
+$tar->init();
+$tar->addFile('.phar/stubАБВГДЕЖЗИЙКЛМНОПF.php', "<?php
+Phar::mapPhar('hio');
+__HALT_COMPILER(); ?>");
+
+$files = array();
+$files['a'] = 'a';
+
+foreach ($files as $n => $file) {
+	$tar->addFile($n, $file);
+}
+
+$tar->close();
+
+include $fname;
+
+echo file_get_contents($alias . '/a') . "\n";
+rename($alias . '/a', $alias . '/b');
+echo file_get_contents($alias . '/b') . "\n";
+echo file_get_contents($alias . '/a') . "\n";
+?>
+--CLEAN--
+<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
+--EXPECTF--
+a
+a
+
+Warning: file_get_contents(phar://%srename_charset-mbАБВГДЕЖЗИЙКЛМНОПF.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%srename_charset-mbАБВГДЕЖЗИЙКЛМНОПF.phar.tar" in %srename_charset-mbАБВГДЕЖЗИЙКЛМНОПF.php on line %d
diff --git a/ext/phar/tests/tar/rename-mb.phpt b/ext/phar/tests/tar/rename-mb.phpt
new file mode 100644
index 0000000000000..66eac67d50e28
--- /dev/null
+++ b/ext/phar/tests/tar/rename-mb.phpt
@@ -0,0 +1,42 @@
+--TEST--
+Phar: rename test tar-based
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.readonly=0
+phar.require_hash=0
+--FILE--
+<?php
+include dirname(__FILE__) . '/files/tarmakerАБВГДЕЖЗИЙКЛМНОПF.php.inc';
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . 'АБВГДЕЖЗИЙКЛМНОПF.phar.tar';
+$alias = 'phar://' . $fname;
+
+$tar = new tarmaker($fname, 'none');
+$tar->init();
+$tar->addFile('.phar/stub.php', "<?php
+Phar::mapPhar('hio');
+__HALT_COMPILER(); ?>");
+
+$files = array();
+$files['a'] = 'a';
+
+foreach ($files as $n => $file) {
+	$tar->addFile($n, $file);
+}
+
+$tar->close();
+
+include $fname;
+
+echo file_get_contents($alias . '/a') . "\n";
+rename($alias . '/a', $alias . '/b');
+echo file_get_contents($alias . '/b') . "\n";
+echo file_get_contents($alias . '/a') . "\n";
+?>
+--CLEAN--
+<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
+--EXPECTF--
+a
+a
+
+Warning: file_get_contents(phar://%srename-mbАБВГДЕЖЗИЙКЛМНОПF.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%srename-mbАБВГДЕЖЗИЙКЛМНОПF.phar.tar" in %srename-mbАБВГДЕЖЗИЙКЛМНОПF.php on line %d
diff --git a/ext/phar/tests/tar/tar_001-mb.phpt b/ext/phar/tests/tar/tar_001-mb.phpt
new file mode 100644
index 0000000000000..69a17ce8be93d
--- /dev/null
+++ b/ext/phar/tests/tar/tar_001-mb.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Phar: tar-based phar corrupted
+--SKIPIF--
+<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
+--FILE--
+<?php
+include dirname(__FILE__) . '/files/make_invalid_tar.php.inc';
+
+$tar = new corrupter(dirname(__FILE__) . '/tar_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar', 'none');
+$tar->init();
+$tar->addFile('tar_001.phpt', __FILE__);
+$tar->close();
+
+$tar = fopen('phar://' . dirname(__FILE__) . '/tar_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar/tar_001АБВГДЕЖЗИЙКЛМНОПF.phpt', 'rb');
+try {
+	$phar = new Phar(dirname(__FILE__) . '/tar_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar');
+	echo "should not execute\n";
+} catch (Exception $e) {
+	echo $e->getMessage() . "\n";
+}
+?>
+===DONE===
+--CLEAN--
+<?php
+@unlink(dirname(__FILE__) . '/tar_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar');
+?>
+--EXPECTF--
+Warning: fopen(phar://%star_001.phar.tar/tar_001-mbАБВГДЕЖЗИЙКЛМНОПF.phpt): failed to open stream: phar error: "%star_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar" is a corrupted tar file (truncated) in %star_001-mbАБВГДЕЖЗИЙКЛМНОПF.php on line 9
+phar error: "%star_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar" is a corrupted tar file (truncated)
+===DONE===
diff --git a/ext/phar/tests/tar/tar_001_charset-mb.phpt b/ext/phar/tests/tar/tar_001_charset-mb.phpt
new file mode 100644
index 0000000000000..af05540018570
--- /dev/null
+++ b/ext/phar/tests/tar/tar_001_charset-mb.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Phar: tar-based phar corrupted
+--SKIPIF--
+<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+include dirname(__FILE__) . '/files/make_invalid_tar.php.inc';
+
+$tar = new corrupter(dirname(__FILE__) . '/tar_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar', 'none');
+$tar->init();
+$tar->addFile('tar_001АБВГДЕЖЗИЙКЛМНОПF.phpt', __FILE__);
+$tar->close();
+
+$tar = fopen('phar://' . dirname(__FILE__) . '/tar_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar/tar_001АБВГДЕЖЗИЙКЛМНОПF.phpt', 'rb');
+try {
+	$phar = new Phar(dirname(__FILE__) . '/tar_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar');
+	echo "should not execute\n";
+} catch (Exception $e) {
+	echo $e->getMessage() . "\n";
+}
+?>
+===DONE===
+--CLEAN--
+<?php
+@unlink(dirname(__FILE__) . '/tar_001.phar.tar');
+?>
+--EXPECTF--
+Warning: fopen(phar://%star_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar/tar_001АБВГДЕЖЗИЙКЛМНОПF.phpt): failed to open stream: phar error: "%star_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar" is a corrupted tar file (truncated) in %star_001АБВГДЕЖЗИЙКЛМНОПF.php on line 9
+phar error: "%star_001АБВГДЕЖЗИЙКЛМНОПF.phar.tar" is a corrupted tar file (truncated)
+===DONE===
diff --git a/ext/standard/tests/dir/dir_basic_charset-mb.phpt b/ext/standard/tests/dir/dir_basic_charset-mb.phpt
new file mode 100644
index 0000000000000..e691dec599719
--- /dev/null
+++ b/ext/standard/tests/dir/dir_basic_charset-mb.phpt
@@ -0,0 +1,88 @@
+--TEST--
+Test dir() function : basic functionality
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+/* 
+ * Prototype  : object dir(string $directory[, resource $context])
+ * Description: Directory class with properties, handle and class and methods read, rewind and close
+ * Source code: ext/standard/dir.c
+ */
+
+echo "*** Testing dir() : basic functionality ***\n";
+
+// include the file.inc for Function: function create_files()
+include(dirname(__FILE__)."/../file/file.inc");
+
+// create the temporary directory
+$file_path = dirname(__FILE__);
+$dir_path = $file_path."/АБВГДЕЖЗИЙКЛМНОПFdir_basic";
+@mkdir($dir_path);
+
+// create files within the temporary directory
+create_files($dir_path, 3, "alphanumeric", 0755, 1, "w", "АБВГДЕЖЗИЙКЛМНОПFdir_basic");
+
+echo "Get Directory instance:\n";
+$d = dir($dir_path);
+var_dump( $d );
+
+echo "\nRead and rewind:\n";
+var_dump( $d->read() );
+var_dump( $d->read() );
+var_dump( $d->rewind() );
+
+echo "\nTest using handle directly:\n";
+var_dump( readdir($d->handle) );
+var_dump( readdir($d->handle) );
+
+echo "\nClose directory:\n";
+var_dump( $d->close() );
+var_dump( $d );
+
+echo "\nTest read after closing the dir:";
+var_dump( $d->read() );
+
+// delete temp files
+delete_files($dir_path, 3, "АБВГДЕЖЗИЙКЛМНОПFdir_basic", 1, ".tmp");
+echo "Done";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+$dir_path = $file_path."/АБВГДЕЖЗИЙКЛМНОПFdir_basic";
+
+rmdir($dir_path);
+?>
+--EXPECTF--
+*** Testing dir() : basic functionality ***
+Get Directory instance:
+object(Directory)#%d (2) {
+  ["path"]=>
+  string(%d) "%s/АБВГДЕЖЗИЙКЛМНОПFdir_basic"
+  ["handle"]=>
+  resource(%d) of type (stream)
+}
+
+Read and rewind:
+string(%d) "%s"
+string(%d) "%s"
+NULL
+
+Test using handle directly:
+string(%d) "%s"
+string(%d) "%s"
+
+Close directory:
+NULL
+object(Directory)#%d (2) {
+  ["path"]=>
+  string(%d) "%sАБВГДЕЖЗИЙКЛМНОПFdir_basic"
+  ["handle"]=>
+  resource(%d) of type (Unknown)
+}
+
+Test read after closing the dir:
+Warning: Directory::read(): %s is not a valid Directory resource in %s on line %d
+bool(false)
+Done
diff --git a/ext/standard/tests/dir/readdir_basic_charset-mb.phpt b/ext/standard/tests/dir/readdir_basic_charset-mb.phpt
new file mode 100644
index 0000000000000..bb8b34592a015
--- /dev/null
+++ b/ext/standard/tests/dir/readdir_basic_charset-mb.phpt
@@ -0,0 +1,75 @@
+--TEST--
+Test readdir() function : basic functionality 
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+/* Prototype  : string readdir([resource $dir_handle])
+ * Description: Read directory entry from dir_handle 
+ * Source code: ext/standard/dir.C
+ */
+
+/*
+ * Test basic functionality of readdir()
+ */
+
+echo "*** Testing readdir() : basic functionality ***\n";
+
+// include the file.inc for Function: function create_files()
+chdir(dirname(__FILE__));
+include(dirname(__FILE__)."/../file/file.inc");
+
+$path = dirname(__FILE__) . '/АБВГДЕЖЗИЙКЛМНОПFreaddir_basic';
+mkdir($path);
+create_files($path, 3);
+
+echo "\n-- Call readdir() with \$path argument --\n";
+var_dump($dh = opendir($path));
+$a = array();
+while( FALSE !== ($file = readdir($dh)) ) {
+	$a[] = $file;
+}
+sort($a);
+foreach($a as $file) {
+	var_dump($file);
+}
+
+echo "\n-- Call readdir() without \$path argument --\n";
+var_dump($dh = opendir($path));
+$a = array();
+while( FALSE !== ( $file = readdir() ) ) {
+	$a[] = $file;
+}
+sort($a);
+foreach($a as $file) {
+	var_dump($file);
+}
+
+delete_files($path, 3);
+closedir($dh);
+?>
+===DONE===
+--CLEAN--
+<?php
+$path = dirname(__FILE__) . '/АБВГДЕЖЗИЙКЛМНОПFreaddir_basic';
+rmdir($path);
+?>
+--EXPECTF--
+*** Testing readdir() : basic functionality ***
+
+-- Call readdir() with $path argument --
+resource(%d) of type (stream)
+string(1) "."
+string(2) ".."
+string(9) "file1.tmp"
+string(9) "file2.tmp"
+string(9) "file3.tmp"
+
+-- Call readdir() without $path argument --
+resource(%d) of type (stream)
+string(1) "."
+string(2) ".."
+string(9) "file1.tmp"
+string(9) "file2.tmp"
+string(9) "file3.tmp"
+===DONE===
diff --git a/ext/standard/tests/dir/readdir_error_charset-mb.phpt b/ext/standard/tests/dir/readdir_error_charset-mb.phpt
new file mode 100644
index 0000000000000..1ad1c525a4a56
--- /dev/null
+++ b/ext/standard/tests/dir/readdir_error_charset-mb.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Test readdir() function : error conditions - Incorrect number of args
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+/* Prototype  : string readdir([resource $dir_handle])
+ * Description: Read directory entry from dir_handle 
+ * Source code: ext/standard/dir.c
+ */
+
+/*
+ * Pass incorrect number of arguments to readdir() to test behaviour
+ */
+
+echo "*** Testing readdir() : error conditions ***\n";
+
+
+//Test readdir with one more than the expected number of arguments
+echo "\n-- Testing readdir() function with more than expected no. of arguments --\n";
+
+$path = dirname(__FILE__) . "/АБВГДЕЖЗИЙКЛМНОПFreaddir_error";
+mkdir($path);
+$dir_handle = opendir($path);
+$extra_arg = 10;
+
+var_dump( readdir($dir_handle, $extra_arg) );
+
+// close the handle so can remove dir in CLEAN section
+closedir($dir_handle);
+?>
+===DONE===
+--CLEAN--
+<?php
+$path = dirname(__FILE__) . "/АБВГДЕЖЗИЙКЛМНОПFreaddir_error";
+rmdir($path);
+?> 
+--EXPECTF--
+*** Testing readdir() : error conditions ***
+
+-- Testing readdir() function with more than expected no. of arguments --
+
+Warning: readdir() expects at most 1 parameter, 2 given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/standard/tests/dir/readdir_variation2_charset-mb.phpt b/ext/standard/tests/dir/readdir_variation2_charset-mb.phpt
new file mode 100644
index 0000000000000..2371fd3dce420
--- /dev/null
+++ b/ext/standard/tests/dir/readdir_variation2_charset-mb.phpt
@@ -0,0 +1,50 @@
+--TEST--
+Test readdir() function : usage variations - empty directories
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+/* Prototype  : string readdir([resource $dir_handle])
+ * Description: Read directory entry from dir_handle 
+ * Source code: ext/standard/dir.c
+ */
+
+/*
+ * Pass readdir() a directory handle pointing to an empty directory to test behaviour
+ */
+
+echo "*** Testing readdir() : usage variations ***\n";
+
+$path = dirname(__FILE__) . '/АБВГДЕЖЗИЙКЛМНОПFreaddir_variation2';
+mkdir($path);
+$dir_handle = opendir($path);
+
+echo "\n-- Pass an empty directory to readdir() --\n";
+function mysort($a,$b) {
+	return strlen($a) > strlen($b) ? 1 : -1;
+}
+$entries = array();
+while(FALSE !== ($file = readdir($dir_handle))){
+	$entries[] = $file;
+}
+
+closedir($dir_handle);
+
+usort($entries, "mysort");
+foreach($entries as $entry) {
+	var_dump($entry);
+}
+?>
+===DONE===
+--CLEAN--
+<?php
+$path = dirname(__FILE__) . '/АБВГДЕЖЗИЙКЛМНОПFreaddir_variation2';
+rmdir($path);
+?>
+--EXPECTF--
+*** Testing readdir() : usage variations ***
+
+-- Pass an empty directory to readdir() --
+string(1) "."
+string(2) ".."
+===DONE===
diff --git a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_variation2-mb.phpt
similarity index 100%
rename from ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt
rename to ext/standard/tests/dir/rewinddir_variation2-mb.phpt
diff --git a/ext/standard/tests/file/fseek_dir_basic_charset-mb.phpt b/ext/standard/tests/file/fseek_dir_basic_charset-mb.phpt
new file mode 100644
index 0000000000000..89283a1ed527c
--- /dev/null
+++ b/ext/standard/tests/file/fseek_dir_basic_charset-mb.phpt
@@ -0,0 +1,98 @@
+--TEST--
+Testing fseek() on a directory stream
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+
+// include the file.inc for Function: function create_files()
+require(dirname(__FILE__) . '/file.inc');
+
+$path = dirname(__FILE__) . '/fseek_dir_basicАБВГДЕЖЗИЙКЛМНОПF';
+mkdir($path);
+create_files($path, 3);
+
+echo "call readdir():\n";
+var_dump($dh = opendir($path));
+$files = array();
+while( FALSE !== ($files[] = readdir($dh)) ) {}
+sort($files);
+var_dump($files);
+$files = array();
+
+echo "\ncall fseek() on directory resource:\n";
+var_dump(fseek($dh, 20));
+
+echo "call readdir():\n";
+while( FALSE !== ($files[] = readdir($dh)) ) {}
+sort($files);
+var_dump($files);
+$files = array();
+
+echo "\ncall fseek() with different arguments on directory resource:\n";
+var_dump(fseek($dh, 20, SEEK_END));
+
+echo "call readdir():\n";
+while( FALSE !== ($files[] = readdir($dh)) ) {}
+sort($files);
+var_dump($files);
+
+delete_files($path, 3);
+closedir($dh);
+var_dump(rmdir($path));
+
+?>
+--EXPECTF--
+call readdir():
+resource(%d) of type (stream)
+array(6) {
+  [0]=>
+  bool(false)
+  [1]=>
+  string(1) "."
+  [2]=>
+  string(2) ".."
+  [3]=>
+  string(9) "file1.tmp"
+  [4]=>
+  string(9) "file2.tmp"
+  [5]=>
+  string(9) "file3.tmp"
+}
+
+call fseek() on directory resource:
+int(0)
+call readdir():
+array(6) {
+  [0]=>
+  bool(false)
+  [1]=>
+  string(1) "."
+  [2]=>
+  string(2) ".."
+  [3]=>
+  string(9) "file1.tmp"
+  [4]=>
+  string(9) "file2.tmp"
+  [5]=>
+  string(9) "file3.tmp"
+}
+
+call fseek() with different arguments on directory resource:
+int(0)
+call readdir():
+array(6) {
+  [0]=>
+  bool(false)
+  [1]=>
+  string(1) "."
+  [2]=>
+  string(2) ".."
+  [3]=>
+  string(9) "file1.tmp"
+  [4]=>
+  string(9) "file2.tmp"
+  [5]=>
+  string(9) "file3.tmp"
+}
+bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/bug54977_charset.phpt b/ext/standard/tests/file/windows_mb_path/bug54977_charset.phpt
new file mode 100644
index 0000000000000..577292d9634ba
--- /dev/null
+++ b/ext/standard/tests/file/windows_mb_path/bug54977_charset.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Bug #54977 UTF-8 files and folder are not shown
+--SKIPIF--
+<?php
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
+
+skip_if_not_win();
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+skip_if_no_required_exts();
+
+?>
+--INI--
+default_charset=shift_jis
+--FILE--
+<?php
+
+/* This file is in UTF-8. */
+
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
+
+$prefix = dirname(__FILE__) . DIRECTORY_SEPARATOR . "testBug54977" . DIRECTORY_SEPARATOR;
+
+$paths = array("多国語", "王", "汚れて掘る");
+
+mkdir($prefix);
+foreach ($paths as $d) {
+	mkdir($prefix . $d);
+	file_put_contents($prefix . $d . ".test", $d);
+}
+
+$myDirectory = opendir($prefix);
+while($entryName = readdir($myDirectory)) {	
+	echo get_basename_with_cp($prefix . $entryName, 65001, false) . "\n";
+}
+closedir($myDirectory);
+
+foreach ($paths as $d) {
+	rmdir($prefix . $d);
+	unlink($prefix . $d . ".test");
+}
+rmdir($prefix);
+
+?>
+===DONE===
+--EXPECT--
+testBug54977
+windows_mb_path
+多国語
+多国語.test
+汚れて掘る
+汚れて掘る.test
+王
+王.test
+===DONE===
diff --git a/ext/standard/tests/file/windows_mb_path/bug64699_charset.phpt b/ext/standard/tests/file/windows_mb_path/bug64699_charset.phpt
new file mode 100644
index 0000000000000..5d54bd16c6c66
--- /dev/null
+++ b/ext/standard/tests/file/windows_mb_path/bug64699_charset.phpt
@@ -0,0 +1,65 @@
+--TEST--
+Bug #64699 is_dir() is inaccurate result on Windows with japanese locale.
+--SKIPIF--
+<?php
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
+
+skip_if_not_win();
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+skip_if_no_required_exts();
+
+?>
+--INI--
+default_charset=shift_jis
+--FILE--
+<?php
+
+/* This file is in UTF-8. */
+
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
+
+$old_cp = get_active_cp();
+set_active_cp(65001);
+
+$prefix = dirname(__FILE__) . DIRECTORY_SEPARATOR . "testBug64699" . DIRECTORY_SEPARATOR;
+
+$dirs = array("a", "ソ", "ゾ", "şŞıİğĞ", "多国語", "表");
+
+mkdir($prefix);
+foreach ($dirs as $d) {
+	mkdir($prefix . $d);
+}
+
+$dir = $prefix;
+if ($dh = opendir($dir)) {
+    while (($file = readdir($dh)) !== false) {
+        $path = $dir . $file;
+        $type = filetype($path);
+        $type2= is_dir($path) ? 'dir' : 'file';
+        $comp = $type == $type2 ? 'OK' : 'NG';
+        echo "filetype()[".str_pad($type, 4)."] == is_dir()[".str_pad($type2, 4)."] -> $comp: {$file}\n";
+    }
+    closedir($dh);
+}
+
+foreach ($dirs as $d) {
+	rmdir($prefix . $d);
+}
+rmdir($prefix);
+
+set_active_cp($old_cp);
+
+?>
+===DONE===
+--EXPECTF--
+Active code page: 65001
+filetype()[dir ] == is_dir()[dir ] -> OK: .
+filetype()[dir ] == is_dir()[dir ] -> OK: ..
+filetype()[dir ] == is_dir()[dir ] -> OK: a
+filetype()[dir ] == is_dir()[dir ] -> OK: şŞıİğĞ
+filetype()[dir ] == is_dir()[dir ] -> OK: ソ
+filetype()[dir ] == is_dir()[dir ] -> OK: ゾ
+filetype()[dir ] == is_dir()[dir ] -> OK: 多国語
+filetype()[dir ] == is_dir()[dir ] -> OK: 表
+Active code page: %d
+===DONE===
diff --git a/ext/standard/tests/file/windows_mb_path/test_readdir_charset_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_readdir_charset_mb_names.phpt
new file mode 100644
index 0000000000000..68c40d4fc2fc3
--- /dev/null
+++ b/ext/standard/tests/file/windows_mb_path/test_readdir_charset_mb_names.phpt
@@ -0,0 +1,77 @@
+--TEST--
+Test readdir() with a dir for multibyte filenames
+--SKIPIF--
+<?php
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
+
+skip_if_not_win();
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+skip_if_no_required_exts();
+
+?>
+--INI--
+default_charset=shift_jis
+--FILE--
+<?php
+
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
+
+$prefix = create_data("mb_names");
+$content = "";
+create_verify_file($prefix, "českýtestování.inc", $content);
+create_verify_file($prefix, "Röd_Statistics.txt", $content);
+create_verify_file($prefix, "š.txt", "");
+create_verify_file($prefix, "tschüß", $content);
+create_verify_file($prefix, "Voláçao", "hola");
+create_verify_file($prefix, "Ελλάδα.txt", "");
+create_verify_file($prefix, "привет", "opened an utf8 filename for reading");
+create_verify_file($prefix, "テストマルチバイト・パス", $content);
+create_verify_file($prefix, "測試多字節路徑", $content);
+create_verify_dir($prefix, "tschüß3");
+create_verify_dir($prefix, "Voláçao3");
+create_verify_dir($prefix, "привет3");
+create_verify_dir($prefix, "テストマルチバイト・パス42");
+create_verify_dir($prefix, "測試多字節路徑5");
+
+
+$dirw = $prefix . DIRECTORY_SEPARATOR;
+
+$old_cp = get_active_cp();
+set_active_cp(65001);
+
+if (is_dir($dirw)) {
+    if ($dh = opendir($dirw)) {
+        while (($file = readdir($dh)) !== false) {
+            echo "filename: $file : filetype: " . filetype($dirw . $file) . "\n";
+        }
+        closedir($dh);
+    }
+} else {
+	echo "is_dir failed\n";
+}
+set_active_cp($old_cp);
+
+remove_data("mb_names");
+
+?>
+===DONE===
+--EXPECTF--
+Active code page: 65001
+filename: . : filetype: dir
+filename: .. : filetype: dir
+filename: Röd_Statistics.txt : filetype: file
+filename: tschüß : filetype: file
+filename: tschüß3 : filetype: dir
+filename: Voláçao : filetype: file
+filename: Voláçao3 : filetype: dir
+filename: českýtestování.inc : filetype: file
+filename: š.txt : filetype: file
+filename: Ελλάδα.txt : filetype: file
+filename: привет : filetype: file
+filename: привет3 : filetype: dir
+filename: テストマルチバイト・パス : filetype: file
+filename: テストマルチバイト・パス42 : filetype: dir
+filename: 測試多字節路徑 : filetype: file
+filename: 測試多字節路徑5 : filetype: dir
+Active code page: %d
+===DONE===
diff --git a/ext/tidy/tests/005_charset-mb.phpt b/ext/tidy/tests/005_charset-mb.phpt
new file mode 100644
index 0000000000000..610cc02f54754
--- /dev/null
+++ b/ext/tidy/tests/005_charset-mb.phpt
@@ -0,0 +1,20 @@
+--TEST--
+tidy_parse_file()
+--SKIPIF--
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php 
+	$a = tidy_parse_file(dirname(__FILE__)."/005АБВГДЕЖЗИЙКЛМНОПF.html");
+	echo tidy_get_output($a);
+	
+?>
+--EXPECT--
+<html>
+<head>
+<title></title>
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/ext/xmlreader/tests/003_charset-mb.phpt b/ext/xmlreader/tests/003_charset-mb.phpt
new file mode 100644
index 0000000000000..d311b860c50e6
--- /dev/null
+++ b/ext/xmlreader/tests/003_charset-mb.phpt
@@ -0,0 +1,86 @@
+--TEST--
+XMLReader: libxml2 XML Reader, attributes test 
+--SKIPIF--
+<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+--INI
+default_charset=cp1251
+--FILE--
+<?php 
+/* $Id$ */
+$filename = dirname(__FILE__) . '/АБВГДЕЖЗИЙКЛМНОПF_003.xml';
+
+$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+<books><book num="1" idx="2">book1</book></books>';
+file_put_contents($filename, $xmlstring);
+
+$reader = new XMLReader();
+if (!$reader->open($filename)) {
+	exit();
+}
+
+// Only go through
+while ($reader->read()) {
+	if ($reader->nodeType != XMLREADER::END_ELEMENT) {
+		if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
+			$attr = $reader->moveToFirstAttribute();
+			echo $reader->name . ": ";
+			echo $reader->value . "\n";
+
+			if ($reader->getAttribute($reader->name) == $reader->value) {
+				echo "1st attr (num) failed\n";
+			}
+
+
+			$attr = $reader->moveToNextAttribute();
+			echo $reader->name . ": ";
+			echo $reader->value . "\n";
+
+			if ($reader->getAttribute($reader->name) == $reader->value) {
+				echo "2nd attr (idx) failed\n";
+			}
+
+			// Named attribute
+			$attr = $reader->moveToAttribute('num');
+			echo $reader->name . ": ";
+			echo $reader->value . "\n";
+
+			if ($reader->getAttribute('num') == $reader->value) {
+				echo "attr num failed\n";
+			}
+
+			$attr = $reader->moveToAttribute('idx');
+			echo $reader->name . ": ";
+			echo $reader->value . "\n";
+
+			if ($reader->getAttribute('idx') == $reader->value) {
+				echo "attr idx failed\n";
+			}
+
+			// Numeric positions of attributes
+			$attr = $reader->moveToAttributeNo(0);
+			echo $reader->name . ": ";
+			echo $reader->value . "\n";
+
+			if ($reader->getAttributeNo(0) == $reader->value) {
+				echo "attr 0 failed\n";
+			}
+
+			$attr = $reader->moveToAttributeNo(1);
+			echo $reader->name . ": ";
+			echo $reader->value . "\n";
+
+		}
+	}
+}
+$reader->close();
+unlink($filename);
+?>
+===DONE===
+--EXPECT--
+num: 1
+idx: 2
+num: 1
+idx: 2
+num: 1
+idx: 2
+===DONE===
diff --git a/ext/xmlwriter/tests/005_charset-mb.phpt b/ext/xmlwriter/tests/005_charset-mb.phpt
new file mode 100644
index 0000000000000..851c64f26fcc3
--- /dev/null
+++ b/ext/xmlwriter/tests/005_charset-mb.phpt
@@ -0,0 +1,35 @@
+--TEST--
+XMLWriter: libxml2 XML Writer, comments 
+--SKIPIF--
+<?php
+if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
+?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php 
+/* $Id$ */
+
+$doc_dest = 'АБВГДЕЖЗИЙКЛМНОПF001.xml';
+$xw = xmlwriter_open_uri($doc_dest);
+xmlwriter_start_document($xw, '1.0', 'UTF-8');
+xmlwriter_start_element($xw, "tag1");
+
+xmlwriter_start_comment($xw);
+xmlwriter_text($xw, 'comment');
+xmlwriter_end_comment($xw);
+xmlwriter_write_comment($xw, "comment #2");
+xmlwriter_end_document($xw);
+
+// Force to write and empty the buffer
+$output_bytes = xmlwriter_flush($xw, true);
+echo file_get_contents($doc_dest);
+unset($xw);
+unlink($doc_dest);
+?>
+===DONE===
+--EXPECT--
+<?xml version="1.0" encoding="UTF-8"?>
+<tag1><!--comment--><!--comment #2--></tag1>
+===DONE===
diff --git a/ext/xsl/tests/xslt008_charset-mb.phpt b/ext/xsl/tests/xslt008_charset-mb.phpt
new file mode 100644
index 0000000000000..a66b26bc3de59
--- /dev/null
+++ b/ext/xsl/tests/xslt008_charset-mb.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test 8: Stream Wrapper Includes
+--SKIPIF--
+<?php
+	require_once dirname(__FILE__) .'/skipif.inc';
+	if (!extension_loaded('zlib')) die('skip zlib extension not available');
+?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+echo "Test 8: Stream Wrapper Includes ";
+include("prepare.inc");
+$xsl = new domDocument;
+$xsl->load(dirname(__FILE__)."/АБВГДЕЖЗИЙКЛМНОПFstreamsinclude.xsl");
+if(!$xsl) {
+  echo "Error while parsing the document\n";
+  exit;
+}
+chdir(dirname(__FILE__));
+$proc->importStylesheet($xsl);
+print "\n";
+print $proc->transformToXML($dom);
+
+
+--EXPECT--
+Test 8: Stream Wrapper Includes 
+<?xml version="1.0" encoding="iso-8859-1"?>
+<html><body>bar
+a1 b1 c1 <br/> 
+a2 c2 <br/> 
+�3 b3 c3 <br/> 
+</body></html>
diff --git a/ext/zip/tests/bug40228_charset-mb.phpt b/ext/zip/tests/bug40228_charset-mb.phpt
new file mode 100644
index 0000000000000..6ee25e5702025
--- /dev/null
+++ b/ext/zip/tests/bug40228_charset-mb.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #40228 (extractTo does not create recursive empty path)
+--SKIPIF--
+<?php if (!extension_loaded("zip")) print "skip"; ?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+$dest = dirname(__FILE__);
+$arc_name = $dest . "/bug40228АБВГДЕЖЗИЙКЛМНОПF.zip";
+$zip = new ZipArchive;
+$zip->open($arc_name, ZIPARCHIVE::CREATE);;
+$zip->extractTo($dest);
+if (is_dir($dest . '/test/empty')) {
+	echo "Ok\n";
+	rmdir($dest . '/test/empty');
+	rmdir($dest . '/test');
+} else {
+	echo "Failed.\n";
+}
+echo "Done\n";
+?>
+--EXPECT--
+Ok
+Done
diff --git a/ext/zlib/tests/004_charset-mb.phpt b/ext/zlib/tests/004_charset-mb.phpt
new file mode 100644
index 0000000000000..45641a4a5da3b
--- /dev/null
+++ b/ext/zlib/tests/004_charset-mb.phpt
@@ -0,0 +1,68 @@
+--TEST--
+gzfile() with various invalid params
+--SKIPIF--
+<?php if (!extension_loaded("zlib")) print "skip"; ?>
+--INI--
+default_charset=cp1251
+--FILE--
+<?php
+
+var_dump(gzfile());
+var_dump(gzfile("nonexistent_file_gzfile",1));
+var_dump(gzfile(1,1,1));
+
+var_dump(gzfile(dirname(__FILE__)."/004АБВГДЕЖЗИЙКЛМНОПF.txt.gz"));
+var_dump(gzfile(dirname(__FILE__)."/004АБВГДЕЖЗИЙКЛМНОПF.txt.gz", 1));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d
+bool(false)
+
+Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d
+NULL
+array(6) {
+  [0]=>
+  string(36) "When you're taught through feelings
+"
+  [1]=>
+  string(26) "Destiny flying high above
+"
+  [2]=>
+  string(38) "all I know is that you can realize it
+"
+  [3]=>
+  string(18) "Destiny who cares
+"
+  [4]=>
+  string(19) "as it turns around
+"
+  [5]=>
+  string(39) "and I know that it descends down on me
+"
+}
+array(6) {
+  [0]=>
+  string(36) "When you're taught through feelings
+"
+  [1]=>
+  string(26) "Destiny flying high above
+"
+  [2]=>
+  string(38) "all I know is that you can realize it
+"
+  [3]=>
+  string(18) "Destiny who cares
+"
+  [4]=>
+  string(19) "as it turns around
+"
+  [5]=>
+  string(39) "and I know that it descends down on me
+"
+}
+Done