diff --git a/tests/config_php_test.php b/tests/config_php_test.php
new file mode 100644
index 0000000000..6e2b4c2ac1
--- /dev/null
+++ b/tests/config_php_test.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+class phpbb_config_php_test extends phpbb_test_case
+{
+	public function test_default()
+	{
+		$config_php = new \phpbb\config_php(dirname( __FILE__ ) . '/fixtures/', 'php');
+		$this->assertSame('bar', $config_php->get('foo'));
+		$this->assertSame(array('foo' => 'bar', 'foo_foo' => 'bar bar'), $config_php->get_all());
+	}
+
+	public function test_set_config_file()
+	{
+		$config_php = new \phpbb\config_php(dirname( __FILE__ ) . '/fixtures/', 'php');
+		$config_php->set_config_file(dirname( __FILE__ ) . '/fixtures/config_other.php');
+		$this->assertSame('foo', $config_php->get('bar'));
+		$this->assertSame(array('bar' => 'foo', 'bar_bar' => 'foo foo'), $config_php->get_all());
+	}
+}
diff --git a/tests/fixtures/config.php b/tests/fixtures/config.php
new file mode 100644
index 0000000000..ae9e8c22de
--- /dev/null
+++ b/tests/fixtures/config.php
@@ -0,0 +1,3 @@
+<?php
+$foo = 'bar';
+$foo_foo = 'bar bar';
diff --git a/tests/fixtures/config_other.php b/tests/fixtures/config_other.php
new file mode 100644
index 0000000000..e0ecc17bb9
--- /dev/null
+++ b/tests/fixtures/config_other.php
@@ -0,0 +1,3 @@
+<?php
+$bar = 'foo';
+$bar_bar = 'foo foo';