diff --git a/tests/RiakClientFunctionalTest/Command/Kv/RiakIndexTest.php b/tests/RiakClientFunctionalTest/Command/Kv/RiakIndexTest.php
index e287d4e..c37d30f 100644
--- a/tests/RiakClientFunctionalTest/Command/Kv/RiakIndexTest.php
+++ b/tests/RiakClientFunctionalTest/Command/Kv/RiakIndexTest.php
@@ -3,7 +3,6 @@
 namespace RiakClientFunctionalTest\Command\Kv;
 
 use RiakClientFunctionalTest\TestCase;
-use Riak\Client\RiakOption;
 use Riak\Client\Command\Kv\FetchValue;
 use Riak\Client\Command\Kv\StoreValue;
 use Riak\Client\Core\Query\RiakObject;
diff --git a/tests/RiakClientFunctionalTest/Command/Kv/RiakObjectTest.php b/tests/RiakClientFunctionalTest/Command/Kv/RiakObjectTest.php
index 46b1dd5..bb731b0 100644
--- a/tests/RiakClientFunctionalTest/Command/Kv/RiakObjectTest.php
+++ b/tests/RiakClientFunctionalTest/Command/Kv/RiakObjectTest.php
@@ -2,17 +2,16 @@
 
 namespace RiakClientFunctionalTest\Command\Kv;
 
-use RiakClientFunctionalTest\TestCase;
 use Riak\Client\RiakOption;
+use RiakClientFunctionalTest\TestCase;
 use Riak\Client\Command\Kv\FetchValue;
 use Riak\Client\Command\Kv\StoreValue;
 use Riak\Client\Core\Query\RiakObject;
 use Riak\Client\Command\Kv\DeleteValue;
 use Riak\Client\Core\Query\RiakLocation;
 use Riak\Client\Core\Query\RiakNamespace;
-use Riak\Client\Core\Query\BucketProperties;
-use Riak\Client\Command\Bucket\StoreBucketProperties;
 use RiakClientFixture\Domain\SimpleObject;
+use Riak\Client\Command\Bucket\StoreBucketProperties;
 
 abstract class RiakObjectTest extends TestCase
 {