diff --git a/lib/Predis/AbortedMultiExec.php b/lib/Predis/AbortedMultiExec.php
deleted file mode 100644
index a7ca31c5..00000000
--- a/lib/Predis/AbortedMultiExec.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Predis;
-
-class AbortedMultiExec extends PredisException {
-    // Aborted MULTI/EXEC transactions
-}
diff --git a/lib/Predis/Client.php b/lib/Predis/Client.php
index 9d87c1d3..37d28e7f 100644
--- a/lib/Predis/Client.php
+++ b/lib/Predis/Client.php
@@ -8,6 +8,7 @@ use Predis\Network\IConnectionSingle;
 use Predis\Profiles\IServerProfile;
 use Predis\Profiles\ServerProfile;
 use Predis\Pipeline\PipelineContext;
+use Predis\Transaction\MultiExecContext;
 
 class Client {
     const VERSION = '0.7.0-dev';
diff --git a/lib/Predis/Transaction/AbortedMultiExecException.php b/lib/Predis/Transaction/AbortedMultiExecException.php
new file mode 100644
index 00000000..acfc58a2
--- /dev/null
+++ b/lib/Predis/Transaction/AbortedMultiExecException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Predis\Transaction;
+
+use Predis\PredisException;
+
+class AbortedMultiExecException extends PredisException {
+    // Aborted MULTI/EXEC transactions
+}
diff --git a/lib/Predis/MultiExecContext.php b/lib/Predis/Transaction/MultiExecContext.php
similarity index 96%
rename from lib/Predis/MultiExecContext.php
rename to lib/Predis/Transaction/MultiExecContext.php
index e344ea0f..1e7c7ee7 100644
--- a/lib/Predis/MultiExecContext.php
+++ b/lib/Predis/Transaction/MultiExecContext.php
@@ -1,6 +1,14 @@
 <?php
 
-namespace Predis;
+namespace Predis\Transaction;
+
+use Predis\Client;
+use Predis\Helpers;
+use Predis\ResponseQueued;
+use Predis\ClientException;
+use Predis\ServerException;
+use Predis\ProtocolException;
+use Predis\CommunicationException;
 
 class MultiExecContext {
     private $_initialized, $_discarded, $_insideBlock, $_checkAndSet, $_watchedKeys;
@@ -186,7 +194,7 @@ class MultiExecContext {
             $reply = $this->_client->exec();
             if ($reply === null) {
                 if ($attemptsLeft === 0) {
-                    throw new AbortedMultiExec(
+                    throw new AbortedMultiExecException(
                         'The current transaction has been aborted by the server'
                     );
                 }
diff --git a/test/ClientFeaturesTest.php b/test/ClientFeaturesTest.php
index 2c9378c7..0cb00312 100644
--- a/test/ClientFeaturesTest.php
+++ b/test/ClientFeaturesTest.php
@@ -486,14 +486,15 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
         $client->flushdb();
 
         $multi = $client->multiExec();
+        $transactionClass = '\Predis\Transaction\MultiExecContext';
 
-        $this->assertInstanceOf('\Predis\MultiExecContext', $multi);
-        $this->assertInstanceOf('\Predis\MultiExecContext', $multi->set('foo', 'bar'));
-        $this->assertInstanceOf('\Predis\MultiExecContext', $multi->set('hoge', 'piyo'));
-        $this->assertInstanceOf('\Predis\MultiExecContext', $multi->mset(array(
+        $this->assertInstanceOf($transactionClass, $multi);
+        $this->assertInstanceOf($transactionClass, $multi->set('foo', 'bar'));
+        $this->assertInstanceOf($transactionClass, $multi->set('hoge', 'piyo'));
+        $this->assertInstanceOf($transactionClass, $multi->mset(array(
             'foofoo' => 'barbar', 'hogehoge' => 'piyopiyo'
         )));
-        $this->assertInstanceOf('\Predis\MultiExecContext', $multi->mget(array(
+        $this->assertInstanceOf($transactionClass, $multi->mget(array(
             'foo', 'hoge', 'foofoo', 'hogehoge'
         )));
 
diff --git a/test/PredisShared.php b/test/PredisShared.php
index cf6e2247..296d9d62 100644
--- a/test/PredisShared.php
+++ b/test/PredisShared.php
@@ -168,10 +168,10 @@ class RC {
         try {
             $wrapFunction($testcaseInstance);
         }
-        catch (Predis\AbortedMultiExec $exception) {
+        catch (Predis\Transaction\AbortedMultiExecException $exception) {
             $thrownException = $exception;
         }
-        $testcaseInstance->assertInstanceOf('Predis\AbortedMultiExec', $thrownException);
+        $testcaseInstance->assertInstanceOf('Predis\Transaction\AbortedMultiExecException', $thrownException);
     }
 
     public static function pushTailAndReturn(Predis\Client $client, $keyName, Array $values, $wipeOut = 0) {