diff --git a/tests/functions/fixtures/style_select.xml b/tests/functions/fixtures/style_select.xml
new file mode 100644
index 0000000000..12d6392ab5
--- /dev/null
+++ b/tests/functions/fixtures/style_select.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_styles">
+		<column>style_id</column>
+		<column>style_name</column>
+		<column>style_active</column>
+		<row>
+			<value>1</value>
+			<value>prosilver</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>subsilver2</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>zoo</value>
+			<value>0</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/functions/style_select_test.php b/tests/functions/style_select_test.php
new file mode 100644
index 0000000000..1e44f3c2cb
--- /dev/null
+++ b/tests/functions/style_select_test.php
@@ -0,0 +1,41 @@
+<?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_style_select_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/style_select.xml');
+	}
+
+	static public function style_select_data()
+	{
+		return array(
+			array('', false, '<option value="1">prosilver</option><option value="2">subsilver2</option>'),
+			array('', true, '<option value="1">prosilver</option><option value="2">subsilver2</option><option value="3">zoo</option>'),
+			array('1', false, '<option value="1" selected="selected">prosilver</option><option value="2">subsilver2</option>'),
+			array('1', true, '<option value="1" selected="selected">prosilver</option><option value="2">subsilver2</option><option value="3">zoo</option>'),
+			array('3', false, '<option value="1">prosilver</option><option value="2">subsilver2</option>'),
+			array('3', true, '<option value="1">prosilver</option><option value="2">subsilver2</option><option value="3" selected="selected">zoo</option>'),
+		);
+	}
+
+	/**
+	* @dataProvider style_select_data
+	*/
+	public function test_style_select($default, $all, $expected)
+	{
+		global $db;
+		$db = $this->new_dbal();
+
+		$this->assertEquals($expected, style_select($default, $all));
+	}
+}