diff --git a/tests/Mailgun/Tests/Connection/ConnectionTest.php b/tests/Mailgun/Tests/Connection/ConnectionTest.php
index 40b0192..1068948 100644
--- a/tests/Mailgun/Tests/Connection/ConnectionTest.php
+++ b/tests/Mailgun/Tests/Connection/ConnectionTest.php
@@ -1,7 +1,7 @@
 <?PHP
 namespace Mailgun\Tests\Connection;
 
-use Mailgun\Tests\MailgunTest;
+use Mailgun\Tests\Mock\Mailgun;
 
 class ConnectionTest extends \Mailgun\Tests\MailgunTestCase{
 
@@ -10,7 +10,7 @@ class ConnectionTest extends \Mailgun\Tests\MailgunTestCase{
 	public function setUp(){ 
 	}
 	public function testNewClientInstantiation(){	
-		$this->client = new MailgunTest("My-Super-Awesome-API-Key", "samples.mailgun.org", false);	
+		$this->client = new Mailgun("My-Super-Awesome-API-Key", "samples.mailgun.org", false);
 	}
 }
 
diff --git a/tests/Mailgun/Tests/Lists/OptInHandlerTest.php b/tests/Mailgun/Tests/Lists/OptInHandlerTest.php
index 735d1b5..ef48963 100644
--- a/tests/Mailgun/Tests/Lists/OptInHandlerTest.php
+++ b/tests/Mailgun/Tests/Lists/OptInHandlerTest.php
@@ -1,7 +1,7 @@
 <?PHP
 namespace Mailgun\Tests\Lists;
 
-use Mailgun\Tests\MailgunTest;
+use Mailgun\Tests\Mock\Mailgun;
 
 class OptInHandler extends \Mailgun\Tests\MailgunTestCase{
 
@@ -10,7 +10,7 @@ class OptInHandler extends \Mailgun\Tests\MailgunTestCase{
 	private $optInHandler;
 
 	public function setUp(){ 
-		$this->client = new MailgunTest("My-Super-Awesome-API-Key");
+		$this->client = new Mailgun("My-Super-Awesome-API-Key");
 		$this->optInHandler = $this->client->OptInHandler();
 	}
 	
diff --git a/tests/Mailgun/Tests/Messages/BatchMessageTest.php b/tests/Mailgun/Tests/Messages/BatchMessageTest.php
index 4f175c0..f8e9d5a 100644
--- a/tests/Mailgun/Tests/Messages/BatchMessageTest.php
+++ b/tests/Mailgun/Tests/Messages/BatchMessageTest.php
@@ -1,7 +1,7 @@
 <?PHP
 namespace Mailgun\Tests\Messages;
 
-use Mailgun\Tests\MailgunTest;
+use Mailgun\Tests\Mock\Mailgun;
 
 class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
 
@@ -9,7 +9,7 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
 	private $sampleDomain = "samples.mailgun.org";
 
 	public function setUp(){ 
-		$this->client = new MailgunTest("My-Super-Awesome-API-Key");
+		$this->client = new Mailgun("My-Super-Awesome-API-Key");
 	}
 	public function testBlankInstantiation(){
 		$message = $this->client->BatchMessage($this->sampleDomain);
diff --git a/tests/Mailgun/Tests/Messages/MessageBuilderTest.php b/tests/Mailgun/Tests/Messages/MessageBuilderTest.php
index 18e89fe..c48a982 100644
--- a/tests/Mailgun/Tests/Messages/MessageBuilderTest.php
+++ b/tests/Mailgun/Tests/Messages/MessageBuilderTest.php
@@ -1,13 +1,13 @@
 <?PHP
 namespace Mailgun\Tests\Messages;
 
-use Mailgun\Tests\MailgunTest;
+use Mailgun\Tests\Mock\Mailgun;
 
 class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
 	private $client;
 
 	public function setUp(){ 
-		$this->client = new MailgunTest("My-Super-Awesome-API-Key", "samples.mailgun.org", false);	
+		$this->client = new Mailgun("My-Super-Awesome-API-Key", "samples.mailgun.org", false);
 	}
 	public function testBlankInstantiation(){
 		$message = $this->client->MessageBuilder();
diff --git a/tests/Mailgun/Tests/Messages/StandardMessageTest.php b/tests/Mailgun/Tests/Messages/StandardMessageTest.php
index 6a663b2..d598b81 100644
--- a/tests/Mailgun/Tests/Messages/StandardMessageTest.php
+++ b/tests/Mailgun/Tests/Messages/StandardMessageTest.php
@@ -1,7 +1,7 @@
 <?PHP
 namespace Mailgun\Tests\Messages;
 
-use Mailgun\Tests\MailgunTest;
+use Mailgun\Tests\Mock\Mailgun;
 
 class StandardMessageTest extends \Mailgun\Tests\MailgunTestCase{
 
@@ -9,7 +9,7 @@ class StandardMessageTest extends \Mailgun\Tests\MailgunTestCase{
 	private $sampleDomain = "samples.mailgun.org";
 
 	public function setUp(){ 
-		$this->client = new MailgunTest("My-Super-Awesome-API-Key");
+		$this->client = new Mailgun("My-Super-Awesome-API-Key");
 	}
 	public function testSendMIMEMessage(){
 		$customMime = "Received: by luna.mailgun.net with SMTP mgrt 8728174999085; Mon, 10 Jun 2013 09:50:58 +0000
diff --git a/tests/Mailgun/Tests/Connection/TestBroker.php b/tests/Mailgun/Tests/Mock/Connection/TestBroker.php
similarity index 95%
rename from tests/Mailgun/Tests/Connection/TestBroker.php
rename to tests/Mailgun/Tests/Mock/Connection/TestBroker.php
index 234fb4b..9ce0ae2 100644
--- a/tests/Mailgun/Tests/Connection/TestBroker.php
+++ b/tests/Mailgun/Tests/Mock/Connection/TestBroker.php
@@ -1,9 +1,9 @@
 <?php
-namespace Mailgun\Tests\Connection;
+namespace Mailgun\Tests\Mock\Connection;
 
 use Mailgun\Connection\RestClient;
 
-class TestBroker extends RestClient{
+class TestBroker extends RestClient {
 	private $apiKey;
 	
 	protected $apiEndpoint;
diff --git a/tests/Mailgun/Tests/MailgunTest.php b/tests/Mailgun/Tests/Mock/Mailgun.php
similarity index 64%
rename from tests/Mailgun/Tests/MailgunTest.php
rename to tests/Mailgun/Tests/Mock/Mailgun.php
index fb5c7c4..905bb20 100644
--- a/tests/Mailgun/Tests/MailgunTest.php
+++ b/tests/Mailgun/Tests/Mock/Mailgun.php
@@ -1,11 +1,11 @@
 <?PHP
 
-namespace Mailgun\Tests;
+namespace Mailgun\Tests\Mock;
 
-use Mailgun\Mailgun;
-use Mailgun\Tests\Connection\TestBroker;
+use Mailgun\Mailgun as Base;
+use Mailgun\Tests\Mock\Connection\TestBroker;
 
-class MailgunTest extends Mailgun
+class Mailgun extends Base
 {
 	protected $debug;
 	protected $restClient;