diff --git a/tests/avatar/driver/barfoo.php b/tests/avatar/driver/barfoo.php
index 12a3943d6c..11c100db36 100644
--- a/tests/avatar/driver/barfoo.php
+++ b/tests/avatar/driver/barfoo.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_avatar_driver_barfoo extends \phpbb\avatar\driver\driver
+namespace phpbb\avatar\driver;
+
+class barfoo extends \phpbb\avatar\driver\driver
 {
 	public function get_data($row)
 	{
diff --git a/tests/avatar/driver/foobar.php b/tests/avatar/driver/foobar.php
index d1713f0fe6..a1e7bdf7cc 100644
--- a/tests/avatar/driver/foobar.php
+++ b/tests/avatar/driver/foobar.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_avatar_driver_foobar extends \phpbb\avatar\driver\driver
+namespace phpbb\avatar\driver;
+
+class foobar extends \phpbb\avatar\driver\driver
 {
 	public function get_data($row)
 	{
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 1ed4298bed..ba1fb04b33 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -27,12 +27,12 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 		$cache = $this->getMock('\phpbb\cache\driver\driver_interface');
 
 		// $this->avatar_foobar will be needed later on
-		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+		$this->avatar_foobar = $this->getMock('\phpbb\avatar\driver\foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
 		$this->avatar_foobar->expects($this->any())
 			->method('get_name')
 			->will($this->returnValue('avatar.driver.foobar'));
 		// barfoo driver can't be mocked with constructor arguments
-		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
+		$this->avatar_barfoo = $this->getMock('\phpbb\avatar\driver\barfoo', array('get_name'));
 		$this->avatar_barfoo->expects($this->any())
 			->method('get_name')
 			->will($this->returnValue('avatar.driver.barfoo'));
@@ -40,7 +40,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 
 		foreach ($this->avatar_drivers() as $driver)
 		{
-			$cur_avatar = $this->getMock('phpbb_avatar_driver_' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+			$cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
 			$cur_avatar->expects($this->any())
 				->method('get_name')
 				->will($this->returnValue('avatar.driver.' . $driver));