diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php
new file mode 100644
index 0000000000..c89a16097d
--- /dev/null
+++ b/tests/datetime/from_format_test.php
@@ -0,0 +1,57 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/user.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/datetime.php';
+require_once dirname(__FILE__) . '/../mock/lang.php';
+
+class phpbb_datetime_from_format_test extends phpbb_test_case
+{
+	public function from_format_data()
+	{
+		return array(
+			array(
+				'UTC',
+				'Y-m-d',
+				'2012-06-08',
+			),
+
+			array(
+				'Europe/Berlin',
+				'Y-m-d H:i:s',
+				'2012-06-08 14:01:02',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider from_format_data()
+	*/
+	public function test_from_format($timezone, $format, $expected)
+	{
+		global $user;
+
+		$user = new phpbb_user();
+		$user->tz = new DateTimeZone($timezone);
+		$user->lang['datetime'] = array(
+			'TODAY'		=> 'Today',
+			'TOMORROW'	=> 'Tomorrow',
+			'YESTERDAY'	=> 'Yesterday',
+			'AGO'		=> array(
+				0		=> 'less than a minute ago',
+				1		=> '%d minute ago',
+				2		=> '%d minutes ago',
+			),
+		);
+
+		$timestamp = $user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone));
+		$this->assertEquals($expected, $user->format_date($timestamp, $format, true));
+	}
+}