diff --git a/examples/CustomDistributionStrategy.php b/examples/CustomDistributionStrategy.php
index bfdac084..46abf41a 100644
--- a/examples/CustomDistributionStrategy.php
+++ b/examples/CustomDistributionStrategy.php
@@ -15,8 +15,8 @@ require 'SharedConfigurations.php';
 // to distribute keys among a cluster of servers simply by creating a class
 // that implements Predis\Distribution\DistributionStrategyInterface.
 
-use Predis\Distribution\DistributionStrategyInterface;
 use Predis\Connection\PredisCluster;
+use Predis\Distribution\DistributionStrategyInterface;
 
 class NaiveDistributionStrategy implements DistributionStrategyInterface
 {
diff --git a/examples/MasterSlaveReplicationComplex.php b/examples/MasterSlaveReplicationComplex.php
index 3de571e9..8b4ebdd0 100644
--- a/examples/MasterSlaveReplicationComplex.php
+++ b/examples/MasterSlaveReplicationComplex.php
@@ -18,9 +18,9 @@ require 'SharedConfigurations.php';
 // in the server profile used by the new client instance and marks it marks it as
 // a read-only operation for replication so that it will be executed on slaves.
 
-use Predis\Profile\ServerProfile;
 use Predis\Command\ScriptedCommand;
 use Predis\Connection\MasterSlaveReplication;
+use Predis\Profile\ServerProfile;
 
 // ------------------------------------------------------------------------- //
 
diff --git a/lib/Predis/Client.php b/lib/Predis/Client.php
index 051fe6cc..165603f8 100644
--- a/lib/Predis/Client.php
+++ b/lib/Predis/Client.php
@@ -12,19 +12,19 @@
 namespace Predis;
 
 use Predis\Command\CommandInterface;
-use Predis\Option\ClientOptionsInterface;
-use Predis\Connection\ConnectionInterface;
+use Predis\Command\ScriptedCommand;
 use Predis\Connection\AggregatedConnectionInterface;
+use Predis\Connection\ConnectionInterface;
 use Predis\Connection\ConnectionFactory;
 use Predis\Connection\ConnectionFactoryInterface;
-use Predis\Profile\ServerProfileInterface;
-use Predis\Option\ClientOptions;
-use Predis\Profile\ServerProfile;
-use Predis\PubSub\PubSubContext;
 use Predis\Monitor\MonitorContext;
+use Predis\Option\ClientOptions;
+use Predis\Option\ClientOptionsInterface;
 use Predis\Pipeline\PipelineContext;
+use Predis\Profile\ServerProfile;
+use Predis\Profile\ServerProfileInterface;
+use Predis\PubSub\PubSubContext;
 use Predis\Transaction\MultiExecContext;
-use Predis\Command\ScriptedCommand;
 
 /**
  * Main class that exposes the most high-level interface to interact with Redis.
diff --git a/lib/Predis/ClientInterface.php b/lib/Predis/ClientInterface.php
index 0e6a20b9..4d3a06f8 100644
--- a/lib/Predis/ClientInterface.php
+++ b/lib/Predis/ClientInterface.php
@@ -11,8 +11,8 @@
 
 namespace Predis;
 
-use Predis\Option\ClientOptionsInterface;
 use Predis\Connection\ConnectionInterface;
+use Predis\Option\ClientOptionsInterface;
 use Predis\Profile\ServerProfileInterface;
 
 /**
diff --git a/lib/Predis/Command/AbstractCommand.php b/lib/Predis/Command/AbstractCommand.php
index efa03ee5..a8c66dfe 100644
--- a/lib/Predis/Command/AbstractCommand.php
+++ b/lib/Predis/Command/AbstractCommand.php
@@ -11,7 +11,6 @@
 
 namespace Predis\Command;
 
-
 /**
  * Base class for Redis commands.
  *
diff --git a/lib/Predis/Connection/AbstractConnection.php b/lib/Predis/Connection/AbstractConnection.php
index 99e197d5..7176b316 100644
--- a/lib/Predis/Connection/AbstractConnection.php
+++ b/lib/Predis/Connection/AbstractConnection.php
@@ -11,10 +11,10 @@
 
 namespace Predis\Connection;
 
-use Predis\Helpers;
-use Predis\ResponseObjectInterface;
 use Predis\ClientException;
+use Predis\Helpers;
 use Predis\NotSupportedException;
+use Predis\ResponseObjectInterface;
 use Predis\Command\CommandInterface;
 use Predis\Protocol\ProtocolException;
 
diff --git a/lib/Predis/Connection/ConnectionFactory.php b/lib/Predis/Connection/ConnectionFactory.php
index 23093c8c..55ce65e0 100644
--- a/lib/Predis/Connection/ConnectionFactory.php
+++ b/lib/Predis/Connection/ConnectionFactory.php
@@ -11,8 +11,8 @@
 
 namespace Predis\Connection;
 
-use Predis\Profile\ServerProfileInterface;
 use Predis\Profile\ServerProfile;
+use Predis\Profile\ServerProfileInterface;
 
 /**
  * Provides a default factory for Redis connections that maps URI schemes
diff --git a/lib/Predis/Connection/MasterSlaveReplication.php b/lib/Predis/Connection/MasterSlaveReplication.php
index 32e38892..f85d731d 100644
--- a/lib/Predis/Connection/MasterSlaveReplication.php
+++ b/lib/Predis/Connection/MasterSlaveReplication.php
@@ -11,8 +11,8 @@
 
 namespace Predis\Connection;
 
-use Predis\Command\CommandInterface;
 use Predis\NotSupportedException;
+use Predis\Command\CommandInterface;
 
 /**
  * Defines the standard virtual connection class that is used
diff --git a/lib/Predis/Connection/PhpiredisConnection.php b/lib/Predis/Connection/PhpiredisConnection.php
index b245e723..a237fe9b 100644
--- a/lib/Predis/Connection/PhpiredisConnection.php
+++ b/lib/Predis/Connection/PhpiredisConnection.php
@@ -11,11 +11,11 @@
 
 namespace Predis\Connection;
 
-use Predis\Command\CommandInterface;
-use Predis\ResponseError;
-use Predis\ResponseQueued;
 use Predis\ClientException;
 use Predis\NotSupportedException;
+use Predis\ResponseError;
+use Predis\ResponseQueued;
+use Predis\Command\CommandInterface;
 
 /**
  * This class provides the implementation of a Predis connection that uses the
diff --git a/lib/Predis/Connection/PredisCluster.php b/lib/Predis/Connection/PredisCluster.php
index 5582456f..878cc214 100644
--- a/lib/Predis/Connection/PredisCluster.php
+++ b/lib/Predis/Connection/PredisCluster.php
@@ -11,12 +11,12 @@
 
 namespace Predis\Connection;
 
-use Predis\Command\CommandInterface;
-use Predis\Command\Hash\CommandHashStrategy;
-use Predis\Distribution\DistributionStrategyInterface;
 use Predis\ClientException;
 use Predis\NotSupportedException;
+use Predis\Command\CommandInterface;
+use Predis\Command\Hash\CommandHashStrategy;
 use Predis\Distribution\HashRing;
+use Predis\Distribution\DistributionStrategyInterface;
 
 /**
  * Abstraction for a cluster of aggregated connections to various Redis servers
diff --git a/lib/Predis/Connection/RedisCluster.php b/lib/Predis/Connection/RedisCluster.php
index 2120d241..111cf610 100644
--- a/lib/Predis/Connection/RedisCluster.php
+++ b/lib/Predis/Connection/RedisCluster.php
@@ -11,10 +11,10 @@
 
 namespace Predis\Connection;
 
-use Predis\ResponseErrorInterface;
-use Predis\Command\CommandInterface;
 use Predis\ClientException;
 use Predis\NotSupportedException;
+use Predis\ResponseErrorInterface;
+use Predis\Command\CommandInterface;
 use Predis\Distribution\CRC16HashGenerator;
 
 /**
diff --git a/lib/Predis/Connection/StreamConnection.php b/lib/Predis/Connection/StreamConnection.php
index 969bfb9e..edae78fb 100644
--- a/lib/Predis/Connection/StreamConnection.php
+++ b/lib/Predis/Connection/StreamConnection.php
@@ -11,9 +11,9 @@
 
 namespace Predis\Connection;
 
+use Predis\NotSupportedException;
 use Predis\ResponseError;
 use Predis\ResponseQueued;
-use Predis\NotSupportedException;
 use Predis\Command\CommandInterface;
 use Predis\Iterator\MultiBulkResponseSimple;
 
diff --git a/lib/Predis/Connection/WebdisConnection.php b/lib/Predis/Connection/WebdisConnection.php
index 85e436c8..d365bde8 100644
--- a/lib/Predis/Connection/WebdisConnection.php
+++ b/lib/Predis/Connection/WebdisConnection.php
@@ -11,12 +11,12 @@
 
 namespace Predis\Connection;
 
-use Predis\Command\CommandInterface;
-use Predis\ResponseObjectInterface;
-use Predis\ResponseError;
 use Predis\NotSupportedException;
-use Predis\Protocol\ProtocolException;
+use Predis\ResponseError;
+use Predis\ResponseObjectInterface;
+use Predis\Command\CommandInterface;
 use Predis\Connection\ConnectionException;
+use Predis\Protocol\ProtocolException;
 
 /**
  * This class implements a Predis connection that actually talks with Webdis
diff --git a/lib/Predis/Helpers.php b/lib/Predis/Helpers.php
index 65cbfb8a..5cd57d58 100644
--- a/lib/Predis/Helpers.php
+++ b/lib/Predis/Helpers.php
@@ -11,9 +11,9 @@
 
 namespace Predis;
 
-use Predis\Connection\ConnectionInterface;
-use Predis\Connection\ClusterConnectionInterface;
 use Predis\Connection\AggregatedConnectionInterface;
+use Predis\Connection\ClusterConnectionInterface;
+use Predis\Connection\ConnectionInterface;
 
 /**
  * Defines a few helper methods.
diff --git a/lib/Predis/Option/ClientCluster.php b/lib/Predis/Option/ClientCluster.php
index dd2b49fe..00b03c9e 100644
--- a/lib/Predis/Option/ClientCluster.php
+++ b/lib/Predis/Option/ClientCluster.php
@@ -12,8 +12,8 @@
 namespace Predis\Option;
 
 use Predis\Connection\ClusterConnectionInterface;
-use Predis\Connection\RedisCluster;
 use Predis\Connection\PredisCluster;
+use Predis\Connection\RedisCluster;
 
 /**
  * Option class that returns a connection cluster to be used by a client.
diff --git a/lib/Predis/Option/ClientReplication.php b/lib/Predis/Option/ClientReplication.php
index 8ea49bc7..f4420adc 100644
--- a/lib/Predis/Option/ClientReplication.php
+++ b/lib/Predis/Option/ClientReplication.php
@@ -11,8 +11,8 @@
 
 namespace Predis\Option;
 
-use Predis\Connection\ReplicationConnectionInterface;
 use Predis\Connection\MasterSlaveReplication;
+use Predis\Connection\ReplicationConnectionInterface;
 
 /**
  * Option class that returns a replication connection be used by a client.
diff --git a/lib/Predis/Pipeline/MultiExecExecutor.php b/lib/Predis/Pipeline/MultiExecExecutor.php
index eeabb2c1..06984fdc 100644
--- a/lib/Predis/Pipeline/MultiExecExecutor.php
+++ b/lib/Predis/Pipeline/MultiExecExecutor.php
@@ -12,14 +12,14 @@
 namespace Predis\Pipeline;
 
 use SplQueue;
+use Predis\ClientException;
+use Predis\ResponseQueued;
 use Predis\ResponseErrorInterface;
-use Predis\Profile\ServerProfileInterface;
+use Predis\ServerException;
 use Predis\Connection\ConnectionInterface;
 use Predis\Connection\SingleConnectionInterface;
-use Predis\ResponseQueued;
-use Predis\ClientException;
-use Predis\ServerException;
 use Predis\Profile\ServerProfile;
+use Predis\Profile\ServerProfileInterface;
 
 /**
  * Implements a pipeline executor that wraps the whole pipeline
diff --git a/lib/Predis/Pipeline/PipelineContext.php b/lib/Predis/Pipeline/PipelineContext.php
index 6a91d45f..102d9951 100644
--- a/lib/Predis/Pipeline/PipelineContext.php
+++ b/lib/Predis/Pipeline/PipelineContext.php
@@ -12,12 +12,12 @@
 namespace Predis\Pipeline;
 
 use SplQueue;
-use Predis\ClientInterface;
 use Predis\BasicClientInterface;
-use Predis\ExecutableContextInterface;
-use Predis\Command\CommandInterface;
-use Predis\Helpers;
 use Predis\ClientException;
+use Predis\ClientInterface;
+use Predis\ExecutableContextInterface;
+use Predis\Helpers;
+use Predis\Command\CommandInterface;
 
 /**
  * Abstraction of a pipeline context where write and read operations
diff --git a/lib/Predis/Pipeline/SafeExecutor.php b/lib/Predis/Pipeline/SafeExecutor.php
index 000dcbb5..4fa1420e 100644
--- a/lib/Predis/Pipeline/SafeExecutor.php
+++ b/lib/Predis/Pipeline/SafeExecutor.php
@@ -12,8 +12,8 @@
 namespace Predis\Pipeline;
 
 use SplQueue;
-use Predis\ServerException;
 use Predis\CommunicationException;
+use Predis\ServerException;
 use Predis\Connection\ConnectionInterface;
 
 /**
diff --git a/lib/Predis/Pipeline/StandardExecutor.php b/lib/Predis/Pipeline/StandardExecutor.php
index fa0cd789..24fa1ae4 100644
--- a/lib/Predis/Pipeline/StandardExecutor.php
+++ b/lib/Predis/Pipeline/StandardExecutor.php
@@ -13,9 +13,9 @@ namespace Predis\Pipeline;
 
 use SplQueue;
 use Predis\ResponseErrorInterface;
+use Predis\ServerException;
 use Predis\Connection\ConnectionInterface;
 use Predis\Connection\ReplicationConnectionInterface;
-use Predis\ServerException;
 
 /**
  * Implements the standard pipeline executor strategy used
diff --git a/lib/Predis/Profile/ServerProfile.php b/lib/Predis/Profile/ServerProfile.php
index 63ef0237..edd7c6b0 100644
--- a/lib/Predis/Profile/ServerProfile.php
+++ b/lib/Predis/Profile/ServerProfile.php
@@ -12,8 +12,8 @@
 namespace Predis\Profile;
 
 use Predis\ClientException;
-use Predis\Command\Processor\CommandProcessorInterface;
 use Predis\Command\Processor\CommandProcessingInterface;
+use Predis\Command\Processor\CommandProcessorInterface;
 
 /**
  * Base class that implements common functionalities of server profiles.
diff --git a/lib/Predis/Protocol/Text/ComposableTextProtocol.php b/lib/Predis/Protocol/Text/ComposableTextProtocol.php
index 33c336a2..14299906 100644
--- a/lib/Predis/Protocol/Text/ComposableTextProtocol.php
+++ b/lib/Predis/Protocol/Text/ComposableTextProtocol.php
@@ -12,10 +12,10 @@
 namespace Predis\Protocol\Text;
 
 use Predis\Command\CommandInterface;
+use Predis\Connection\ComposableConnectionInterface;
 use Predis\Protocol\ResponseReaderInterface;
 use Predis\Protocol\CommandSerializerInterface;
 use Predis\Protocol\ComposableProtocolInterface;
-use Predis\Connection\ComposableConnectionInterface;
 
 /**
  * Implements a customizable protocol processor that uses the standard Redis
diff --git a/lib/Predis/Protocol/Text/ResponseBulkHandler.php b/lib/Predis/Protocol/Text/ResponseBulkHandler.php
index 1c15ef46..7962b6c5 100644
--- a/lib/Predis/Protocol/Text/ResponseBulkHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseBulkHandler.php
@@ -12,9 +12,9 @@
 namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
-use Predis\Protocol\ResponseHandlerInterface;
-use Predis\Protocol\ProtocolException;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Protocol\ProtocolException;
+use Predis\Protocol\ResponseHandlerInterface;
 
 /**
  * Implements a response handler for bulk replies using the standard wire
diff --git a/lib/Predis/Protocol/Text/ResponseErrorHandler.php b/lib/Predis/Protocol/Text/ResponseErrorHandler.php
index 292dcc6f..06a7cd08 100644
--- a/lib/Predis/Protocol/Text/ResponseErrorHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseErrorHandler.php
@@ -12,8 +12,8 @@
 namespace Predis\Protocol\Text;
 
 use Predis\ResponseError;
-use Predis\Protocol\ResponseHandlerInterface;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Protocol\ResponseHandlerInterface;
 
 /**
  * Implements a response handler for error replies using the standard wire
diff --git a/lib/Predis/Protocol/Text/ResponseIntegerHandler.php b/lib/Predis/Protocol/Text/ResponseIntegerHandler.php
index 0517d46f..146ffb52 100644
--- a/lib/Predis/Protocol/Text/ResponseIntegerHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseIntegerHandler.php
@@ -12,9 +12,9 @@
 namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
-use Predis\Protocol\ResponseHandlerInterface;
-use Predis\Protocol\ProtocolException;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Protocol\ProtocolException;
+use Predis\Protocol\ResponseHandlerInterface;
 
 /**
  * Implements a response handler for integer replies using the standard wire
diff --git a/lib/Predis/Protocol/Text/ResponseMultiBulkHandler.php b/lib/Predis/Protocol/Text/ResponseMultiBulkHandler.php
index 8547d8fd..3d29f237 100644
--- a/lib/Predis/Protocol/Text/ResponseMultiBulkHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseMultiBulkHandler.php
@@ -12,9 +12,9 @@
 namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
-use Predis\Protocol\ResponseHandlerInterface;
-use Predis\Protocol\ProtocolException;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Protocol\ProtocolException;
+use Predis\Protocol\ResponseHandlerInterface;
 
 /**
  * Implements a response handler for multi-bulk replies using the standard
diff --git a/lib/Predis/Protocol/Text/ResponseMultiBulkStreamHandler.php b/lib/Predis/Protocol/Text/ResponseMultiBulkStreamHandler.php
index 44f44725..02402272 100644
--- a/lib/Predis/Protocol/Text/ResponseMultiBulkStreamHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseMultiBulkStreamHandler.php
@@ -12,10 +12,10 @@
 namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
-use Predis\Protocol\ResponseHandlerInterface;
-use Predis\Protocol\ProtocolException;
 use Predis\Connection\ComposableConnectionInterface;
 use Predis\Iterator\MultiBulkResponseSimple;
+use Predis\Protocol\ProtocolException;
+use Predis\Protocol\ResponseHandlerInterface;
 
 /**
  * Implements a response handler for iterable multi-bulk replies using the
diff --git a/lib/Predis/Protocol/Text/ResponseStatusHandler.php b/lib/Predis/Protocol/Text/ResponseStatusHandler.php
index 07dd52d0..978996a3 100644
--- a/lib/Predis/Protocol/Text/ResponseStatusHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseStatusHandler.php
@@ -12,8 +12,8 @@
 namespace Predis\Protocol\Text;
 
 use Predis\ResponseQueued;
-use Predis\Protocol\ResponseHandlerInterface;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Protocol\ResponseHandlerInterface;
 
 /**
  * Implements a response handler for status replies using the standard wire
diff --git a/lib/Predis/Protocol/Text/TextProtocol.php b/lib/Predis/Protocol/Text/TextProtocol.php
index 68464581..c52e97e0 100644
--- a/lib/Predis/Protocol/Text/TextProtocol.php
+++ b/lib/Predis/Protocol/Text/TextProtocol.php
@@ -16,10 +16,10 @@ use Predis\ResponseError;
 use Predis\ResponseQueued;
 use Predis\ServerException;
 use Predis\Command\CommandInterface;
-use Predis\Protocol\ProtocolInterface;
-use Predis\Protocol\ProtocolException;
 use Predis\Connection\ComposableConnectionInterface;
 use Predis\Iterator\MultiBulkResponseSimple;
+use Predis\Protocol\ProtocolException;
+use Predis\Protocol\ProtocolInterface;
 
 /**
  * Implements a protocol processor for the standard wire protocol defined by Redis.
diff --git a/lib/Predis/Protocol/Text/TextResponseReader.php b/lib/Predis/Protocol/Text/TextResponseReader.php
index e6acce40..6d767d98 100644
--- a/lib/Predis/Protocol/Text/TextResponseReader.php
+++ b/lib/Predis/Protocol/Text/TextResponseReader.php
@@ -12,10 +12,10 @@
 namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
-use Predis\Protocol\ResponseReaderInterface;
-use Predis\Protocol\ResponseHandlerInterface;
-use Predis\Protocol\ProtocolException;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Protocol\ProtocolException;
+use Predis\Protocol\ResponseHandlerInterface;
+use Predis\Protocol\ResponseReaderInterface;
 
 /**
  * Implements a pluggable response reader using the standard wire protocol
diff --git a/lib/Predis/PubSub/AbstractPubSubContext.php b/lib/Predis/PubSub/AbstractPubSubContext.php
index 30240b51..ab45bf95 100644
--- a/lib/Predis/PubSub/AbstractPubSubContext.php
+++ b/lib/Predis/PubSub/AbstractPubSubContext.php
@@ -11,9 +11,9 @@
 
 namespace Predis\PubSub;
 
+use Predis\ClientException;
 use Predis\ClientInterface;
 use Predis\Helpers;
-use Predis\ClientException;
 use Predis\NotSupportedException;
 
 /**
diff --git a/lib/Predis/PubSub/PubSubContext.php b/lib/Predis/PubSub/PubSubContext.php
index 282730c6..ef3e6383 100644
--- a/lib/Predis/PubSub/PubSubContext.php
+++ b/lib/Predis/PubSub/PubSubContext.php
@@ -11,9 +11,9 @@
 
 namespace Predis\PubSub;
 
+use Predis\ClientException;
 use Predis\ClientInterface;
 use Predis\Helpers;
-use Predis\ClientException;
 use Predis\NotSupportedException;
 use Predis\Connection\AggregatedConnectionInterface;
 
diff --git a/lib/Predis/Transaction/MultiExecContext.php b/lib/Predis/Transaction/MultiExecContext.php
index 1a3b0aa4..82d86d7a 100644
--- a/lib/Predis/Transaction/MultiExecContext.php
+++ b/lib/Predis/Transaction/MultiExecContext.php
@@ -12,17 +12,17 @@
 namespace Predis\Transaction;
 
 use SplQueue;
-use Predis\ClientInterface;
 use Predis\BasicClientInterface;
+use Predis\ClientException;
+use Predis\ClientInterface;
+use Predis\CommunicationException;
 use Predis\ExecutableContextInterface;
+use Predis\NotSupportedException;
 use Predis\ResponseErrorInterface;
+use Predis\ResponseQueued;
+use Predis\ServerException;
 use Predis\Command\CommandInterface;
 use Predis\Connection\AggregatedConnectionInterface;
-use Predis\ResponseQueued;
-use Predis\ClientException;
-use Predis\ServerException;
-use Predis\NotSupportedException;
-use Predis\CommunicationException;
 use Predis\Protocol\ProtocolException;
 
 /**
diff --git a/tests/Predis/ClientTest.php b/tests/Predis/ClientTest.php
index bbcba5fd..372ec313 100644
--- a/tests/Predis/ClientTest.php
+++ b/tests/Predis/ClientTest.php
@@ -13,10 +13,10 @@ namespace Predis;
 
 use \PHPUnit_Framework_TestCase as StandardTestCase;
 
-use Predis\Profile\ServerProfile;
-use Predis\Connection\PredisCluster;
-use Predis\Connection\MasterSlaveReplication;
 use Predis\Connection\ConnectionFactory;
+use Predis\Connection\MasterSlaveReplication;
+use Predis\Connection\PredisCluster;
+use Predis\Profile\ServerProfile;
 
 /**
  *
diff --git a/tests/Predis/Command/Hash/CommandHashStrategyTest.php b/tests/Predis/Command/Hash/CommandHashStrategyTest.php
index 602ad6cc..3d43311d 100644
--- a/tests/Predis/Command/Hash/CommandHashStrategyTest.php
+++ b/tests/Predis/Command/Hash/CommandHashStrategyTest.php
@@ -12,8 +12,9 @@
 namespace Predis\Command\Hash;
 
 use \PHPUnit_Framework_TestCase as StandardTestCase;
-use Predis\Profile\ServerProfile;
+
 use Predis\Distribution\HashRing;
+use Predis\Profile\ServerProfile;
 
 /**
  *
diff --git a/tests/Predis/CommunicationExceptionTest.php b/tests/Predis/CommunicationExceptionTest.php
index 09874c2a..b3906040 100644
--- a/tests/Predis/CommunicationExceptionTest.php
+++ b/tests/Predis/CommunicationExceptionTest.php
@@ -12,6 +12,7 @@
 namespace Predis;
 
 use \PHPUnit_Framework_TestCase as StandardTestCase;
+
 use Predis\Connection\SingleConnectionInterface;
 
 /**
diff --git a/tests/Predis/Option/ClientProfileTest.php b/tests/Predis/Option/ClientProfileTest.php
index 0b571bb2..0a6c7ae1 100644
--- a/tests/Predis/Option/ClientProfileTest.php
+++ b/tests/Predis/Option/ClientProfileTest.php
@@ -13,8 +13,8 @@ namespace Predis\Option;
 
 use \PHPUnit_Framework_TestCase as StandardTestCase;
 
-use Predis\Profile\ServerProfile;
 use Predis\Command\Processor\KeyPrefixProcessor;
+use Predis\Profile\ServerProfile;
 
 /**
  *
diff --git a/tests/Predis/Profile/ServerProfileTest.php b/tests/Predis/Profile/ServerProfileTest.php
index 1afd9da9..bb1e3e56 100644
--- a/tests/Predis/Profile/ServerProfileTest.php
+++ b/tests/Predis/Profile/ServerProfileTest.php
@@ -12,6 +12,7 @@
 namespace Predis\Profile;
 
 use \PHPUnit_Framework_TestCase as StandardTestCase;
+
 use Predis\Command\Processor\ProcessorChain;
 
 /**