diff --git a/tests/util/RedirectUriTest.php b/tests/util/RedirectUriTest.php
index 9ae67f0b..eb620ddd 100644
--- a/tests/util/RedirectUriTest.php
+++ b/tests/util/RedirectUriTest.php
@@ -1,12 +1,17 @@
 <?php
 
-class RedirectUri_test extends PHPUnit_Framework_TestCase
+namespace LeagueTests\Util;
+
+use League\OAuth2\Server\Util\RedirectUri;
+use \Mockery as M;
+
+class RedirectUriTest extends \PHPUnit_Framework_TestCase
 {
-	function test_make()
+	function testMake()
 	{
-		$v1 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar'));
-		$v2 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar'), '#');
-		$v3 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar', 'bar' => 'foo'));
+		$v1 = RedirectUri::make('https://foobar/', array('foo'=>'bar'));
+		$v2 = RedirectUri::make('https://foobar/', array('foo'=>'bar'), '#');
+		$v3 = RedirectUri::make('https://foobar/', array('foo'=>'bar', 'bar' => 'foo'));
 
 		$this->assertEquals('https://foobar/?foo=bar', $v1);
 		$this->assertEquals('https://foobar/#foo=bar', $v2);
diff --git a/tests/util/SecureKeyTest.php b/tests/util/SecureKeyTest.php
index 3d60f6db..2be3e12b 100644
--- a/tests/util/SecureKeyTest.php
+++ b/tests/util/SecureKeyTest.php
@@ -1,12 +1,17 @@
 <?php
 
-class Secure_Key_test extends PHPUnit_Framework_TestCase
+namespace LeagueTests\Util;
+
+use League\OAuth2\Server\Util\SecureKey;
+use \Mockery as M;
+
+class SecureKeyTest extends \PHPUnit_Framework_TestCase
 {
-	function test_make()
+	function testMake()
 	{
-		$v1 = League\OAuth2\Server\Util\SecureKey::make();
-		$v2 = League\OAuth2\Server\Util\SecureKey::make();
-		$v3 = League\OAuth2\Server\Util\SecureKey::make(50);
+		$v1 = SecureKey::make();
+		$v2 = SecureKey::make();
+		$v3 = SecureKey::make(50);
 
 		$this->assertEquals(40, strlen($v1));
 		$this->assertTrue($v1 !== $v2);