diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php
new file mode 100644
index 0000000000..a67ccbe89f
--- /dev/null
+++ b/tests/dbal/sql_insert_buffer_test.php
@@ -0,0 +1,176 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	public function insert_buffer_data()
+	{
+		$db = $this->new_dbal();
+
+		if ($db->multi_insert)
+		{
+			// Test with enabled and disabled multi_insert
+			return array(
+				array(true),
+				array(false),
+			);
+		}
+		else
+		{
+			// Only test with disabled multi_insert, the DB doesn't support it
+			return array(
+				array(false),
+			);
+		}
+	}
+
+	/**
+	* @dataProvider insert_buffer_data
+	*/
+	public function test_insert_and_flush($force_multi_insert)
+	{
+		$db = $this->new_dbal();
+		$db->multi_insert = $force_multi_insert;
+
+		$buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2);
+
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+		$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
+		$db->sql_freeresult($result);
+
+		// This call can be buffered
+		$buffer->insert(array(
+			'config_name'	=> 'name1',
+			'config_value'	=> 'value1',
+			'is_dynamic'	=> '0',
+		));
+
+		if ($db->multi_insert)
+		{
+			$sql = 'SELECT COUNT(*) AS num_configs
+				FROM phpbb_config';
+			$result = $db->sql_query_limit($sql, 1);
+			$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
+			$db->sql_freeresult($result);
+		}
+		else
+		{
+			$sql = 'SELECT COUNT(*) AS num_configs
+				FROM phpbb_config';
+			$result = $db->sql_query_limit($sql, 1);
+			$this->assertEquals(3, $db->sql_fetchfield('num_configs'));
+			$db->sql_freeresult($result);
+		}
+
+		// Manually flush
+		$buffer->flush();
+
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+		$this->assertEquals(3, $db->sql_fetchfield('num_configs'));
+		$db->sql_freeresult($result);
+	}
+
+	/**
+	* @dataProvider insert_buffer_data
+	*/
+	public function test_insert_with_flush($force_multi_insert)
+	{
+		$db = $this->new_dbal();
+		$db->multi_insert = $force_multi_insert;
+
+		$buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2);
+
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+		$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
+		$db->sql_freeresult($result);
+
+		$buffer->insert(array(
+			'config_name'	=> 'name1',
+			'config_value'	=> 'value1',
+			'is_dynamic'	=> '0',
+		));
+
+		// This call flushes the values
+		$buffer->insert(array(
+			'config_name'	=> 'name2',
+			'config_value'	=> 'value2',
+			'is_dynamic'	=> '0',
+		));
+
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+		$this->assertEquals(4, $db->sql_fetchfield('num_configs'));
+		$db->sql_freeresult($result);
+	}
+
+	/**
+	* @dataProvider insert_buffer_data
+	*/
+	public function test_insert_all_and_flush($force_multi_insert)
+	{
+		$db = $this->new_dbal();
+		$db->multi_insert = $force_multi_insert;
+
+		$buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2);
+
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+		$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
+		$db->sql_freeresult($result);
+
+		$buffer->insert_all(array(
+			array(
+				'config_name'	=> 'name1',
+				'config_value'	=> 'value1',
+				'is_dynamic'	=> '0',
+			),
+			array(
+				'config_name'	=> 'name2',
+				'config_value'	=> 'value2',
+				'is_dynamic'	=> '0',
+			),
+			array(
+				'config_name'	=> 'name3',
+				'config_value'	=> 'value3',
+				'is_dynamic'	=> '0',
+			),
+		));
+
+		if ($db->multi_insert)
+		{
+			$sql = 'SELECT COUNT(*) AS num_configs
+				FROM phpbb_config';
+			$result = $db->sql_query_limit($sql, 1);
+			$this->assertEquals(4, $db->sql_fetchfield('num_configs'));
+			$db->sql_freeresult($result);
+
+			// Manually flush
+			$buffer->flush();
+		}
+
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+		$this->assertEquals(5, $db->sql_fetchfield('num_configs'));
+		$db->sql_freeresult($result);
+	}
+}