diff --git a/tests/utf/all_tests.php b/tests/utf/all_tests.php
index 8d1b1bab3f..7274b29aed 100644
--- a/tests/utf/all_tests.php
+++ b/tests/utf/all_tests.php
@@ -9,6 +9,7 @@ require_once 'PHPUnit/Framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'utf/utf8_wordwrap_test.php';
+require_once 'utf/utf8_clean_string_test.php';
 
 class phpbb_utf_all_tests
 {
@@ -22,6 +23,7 @@ class phpbb_utf_all_tests
 		$suite = new PHPUnit_Framework_TestSuite('phpBB Unicode Transformation Format');
 
 		$suite->addTestSuite('phpbb_utf_utf8_wordwrap_test');
+		$suite->addTestSuite('phpbb_utf_utf8_clean_string_test');
 
 		return $suite;
 	}
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
new file mode 100644
index 0000000000..8501a655e4
--- /dev/null
+++ b/tests/utf/utf8_clean_string_test.php
@@ -0,0 +1,29 @@
+<?php
+define('IN_PHPBB', true);
+
+require_once 'PHPUnit/Framework.php';
+
+$phpbb_root_path = '../phpBB/';
+$phpEx = 'php';
+require_once '../phpBB/includes/utf/utf_tools.php';
+
+class phpbb_utf_utf8_clean_string_test extends PHPUnit_Framework_TestCase
+{
+	public static function cleanable_strings()
+	{
+		return array(
+			array('MiXed CaSe', 'mixed case', 'Checking case folding'),
+			array('  many   spaces   ', 'many spaces', 'Checking whitespace reduction'),
+			array("we\xC2\xA1rd\xE1\x9A\x80ch\xCE\xB1r\xC2\xADacters", 'weird characters', 'Checking confusables replacement'),
+		);
+	}
+
+	/**
+	* @dataProvider cleanable_strings
+	*/
+	public function test_utf8_clean_string($input, $output, $label)
+	{
+		$this->assertEquals($output, utf8_clean_string($input), $label);
+	}
+}
+?>
\ No newline at end of file