diff --git a/src/BlockCipher.php b/src/BlockCipher.php
index 1fc03bf..b65aa2c 100644
--- a/src/BlockCipher.php
+++ b/src/BlockCipher.php
@@ -9,10 +9,8 @@
 
 namespace Zend\Crypt;
 
-use Zend\Crypt\Hmac;
 use Zend\Crypt\Key\Derivation\Pbkdf2;
 use Zend\Crypt\Symmetric\SymmetricInterface;
-use Zend\Crypt\Utils;
 use Zend\Math\Rand;
 
 /**
diff --git a/src/Key/Derivation/Scrypt.php b/src/Key/Derivation/Scrypt.php
index 3eb2985..6140cb8 100644
--- a/src/Key/Derivation/Scrypt.php
+++ b/src/Key/Derivation/Scrypt.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Crypt\Key\Derivation;
 
-use Zend\Crypt\Key\Derivation\Pbkdf2;
 
 /**
  * Scrypt key derivation function
diff --git a/src/PublicKey/Rsa.php b/src/PublicKey/Rsa.php
index 0102cae..44faaa7 100644
--- a/src/PublicKey/Rsa.php
+++ b/src/PublicKey/Rsa.php
@@ -11,7 +11,6 @@
 
 use Traversable;
 use Zend\Crypt\PublicKey\Rsa\Exception;
-use Zend\Crypt\PublicKey\RsaOptions;
 use Zend\Stdlib\ArrayUtils;
 
 /**
diff --git a/test/PublicKey/DiffieHellmanTest.php b/test/PublicKey/DiffieHellmanTest.php
index 3b44e7e..1a5ecbf 100644
--- a/test/PublicKey/DiffieHellmanTest.php
+++ b/test/PublicKey/DiffieHellmanTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Crypt;
+namespace ZendTest\Crypt\PublicKey;
 
 use Zend\Crypt\PublicKey\DiffieHellman;
 use Zend\Math\BigInteger;
diff --git a/test/PublicKey/RsaTest.php b/test/PublicKey/RsaTest.php
index bb44d1b..5e2766e 100644
--- a/test/PublicKey/RsaTest.php
+++ b/test/PublicKey/RsaTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Crypt;
+namespace ZendTest\Crypt\PublicKey;
 
 use Zend\Crypt\PublicKey\Rsa;
 use Zend\Crypt\PublicKey\RsaOptions;