diff --git a/tests/functions/fixtures/language_select.xml b/tests/functions/fixtures/language_select.xml
new file mode 100644
index 0000000000..02fdee093e
--- /dev/null
+++ b/tests/functions/fixtures/language_select.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_lang">
+		<column>lang_id</column>
+		<column>lang_iso</column>
+		<column>lang_local_name</column>
+		<row>
+			<value>1</value>
+			<value>en</value>
+			<value>English</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>de</value>
+			<value>Deutsch</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/functions/language_select_test.php b/tests/functions/language_select_test.php
new file mode 100644
index 0000000000..3e7ed45bbf
--- /dev/null
+++ b/tests/functions/language_select_test.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_functions_language_select_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/language_select.xml');
+	}
+
+	static public function language_select_data()
+	{
+		return array(
+			array('', '<option value="en">English</option><option value="de">Deutsch</option>'),
+			array('en', '<option value="en" selected="selected">English</option><option value="de">Deutsch</option>'),
+			array('de', '<option value="en">English</option><option value="de" selected="selected">Deutsch</option>'),
+		);
+	}
+
+	/**
+	* @dataProvider language_select_data
+	*/
+	public function test_language_select($default, $expected)
+	{
+		global $db;
+		$db = $this->new_dbal();
+
+		$this->assertEquals($expected, language_select($default));
+	}
+}