diff --git a/tests/Unit/Crypt/AES/ContinuousBufferTest.php b/tests/Unit/Crypt/AES/ContinuousBufferTest.php
deleted file mode 100644
index e032dab6..00000000
--- a/tests/Unit/Crypt/AES/ContinuousBufferTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * @author    Andreas Fischer <bantu@phpbb.com>
- * @copyright MMXIII Andreas Fischer
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-class Unit_Crypt_AES_ContinuousBufferTest extends Unit_Crypt_AES_TestCase
-{
-    // String intented
-    protected $modes = array(
-        'CRYPT_AES_MODE_CTR',
-        'CRYPT_AES_MODE_OFB',
-        'CRYPT_AES_MODE_CFB',
-    );
-
-    protected $plaintexts = array(
-        '',
-        '12345678901234567', // https://github.com/phpseclib/phpseclib/issues/39
-        "\xDE\xAD\xBE\xAF",
-        ':-):-):-):-):-):-)', // https://github.com/phpseclib/phpseclib/pull/43
-    );
-
-    protected $ivs = array(
-        '',
-        'test123',
-    );
-
-    protected $keys = array(
-        '',
-        ':-8', // https://github.com/phpseclib/phpseclib/pull/43
-        'FOOBARZ',
-    );
-
-    /**
-    * Produces all combinations of test values.
-    *
-    * @return array
-    */
-    public function allCombinations()
-    {
-        $result = array();
-
-        // @codingStandardsIgnoreStart
-        foreach ($this->modes as $mode)
-        foreach ($this->plaintexts as $plaintext)
-        foreach ($this->ivs as $iv)
-        foreach ($this->keys as $key)
-            $result[] = array($mode, $plaintext, $iv, $key);
-        // @codingStandardsIgnoreEnd
-
-        return $result;
-    }
-
-    /**
-    * @dataProvider allCombinations
-    */
-    public function testEncryptDecrypt($mode, $plaintext, $iv, $key)
-    {
-        $aes = new Crypt_AES(constant($mode));
-        $aes->enableContinuousBuffer();
-        $aes->setIV($iv);
-        $aes->setKey($key);
-
-        $actual = '';
-        for ($i = 0, $strlen = strlen($plaintext); $i < $strlen; ++$i) {
-            $actual .= $aes->decrypt($aes->encrypt($plaintext[$i]));
-        }
-
-        $this->assertEquals($plaintext, $actual);
-    }
-}
diff --git a/tests/Unit/Crypt/AES/InternalTest.php b/tests/Unit/Crypt/AES/InternalTest.php
new file mode 100644
index 00000000..17293363
--- /dev/null
+++ b/tests/Unit/Crypt/AES/InternalTest.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright MMXIII Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+class Unit_Crypt_AES_InternalTest extends Unit_Crypt_AES_TestCase
+{
+    static public function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        self::ensureConstant('CRYPT_AES_MODE', CRYPT_AES_MODE_INTERNAL);
+    }
+}
\ No newline at end of file
diff --git a/tests/Unit/Crypt/AES/TestCase.php b/tests/Unit/Crypt/AES/TestCase.php
index c4bf57e6..a98d95d9 100644
--- a/tests/Unit/Crypt/AES/TestCase.php
+++ b/tests/Unit/Crypt/AES/TestCase.php
@@ -5,23 +5,95 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-require_once 'Crypt/AES.php';
-
-abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
+abstract class Unit_Crypt_AES_Test extends PhpSeclibTestcase
 {
     static public function setUpBeforeClass()
     {
-        if (!defined('CRYPT_AES_MODE')) {
-            define('CRYPT_AES_MODE', CRYPT_AES_MODE_INTERNAL);
-        }
+        parent::setUpBeforeClass();
+
+        self::reRequireFile('Crypt/Rijndael.php');
+        self::reRequireFile('Crypt/AES.php');
     }
 
-    public function setUp()
+    /**
+    * Produces all combinations of test values.
+    *
+    * @return array
+    */
+    public function continuousBufferCombos()
     {
-        if (defined('CRYPT_AES_MODE') && CRYPT_AES_MODE !== CRYPT_AES_MODE_INTERNAL) {
-            $this->markTestSkipped(
-                'Skipping test because CRYPT_AES_MODE is not defined as CRYPT_AES_MODE_INTERNAL.'
-            );
+        $modes = array(
+            'CRYPT_AES_MODE_CTR',
+            'CRYPT_AES_MODE_OFB',
+            'CRYPT_AES_MODE_CFB',
+        );
+        $plaintexts = array(
+            '',
+            '12345678901234567', // https://github.com/phpseclib/phpseclib/issues/39
+            "\xDE\xAD\xBE\xAF",
+            ':-):-):-):-):-):-)', // https://github.com/phpseclib/phpseclib/pull/43
+        );
+        $ivs = array(
+            '',
+            'test123',
+        );
+        $keys = array(
+            '',
+            ':-8', // https://github.com/phpseclib/phpseclib/pull/43
+            'FOOBARZ',
+        );
+
+        $result = array();
+
+        // @codingStandardsIgnoreStart
+        foreach ($this->modes as $mode)
+        foreach ($this->plaintexts as $plaintext)
+        foreach ($this->ivs as $iv)
+        foreach ($this->keys as $key)
+            $result[] = array($mode, $plaintext, $iv, $key);
+        // @codingStandardsIgnoreEnd
+
+        return $result;
+    }
+
+    /**
+    * @dataProvider continuousBufferCombos
+    */
+    public function testEncryptDecryptWithContinuousBuffer($mode, $plaintext, $iv, $key)
+    {
+        $aes = new Crypt_AES(constant($mode));
+        $aes->enableContinuousBuffer();
+        $aes->setIV($iv);
+        $aes->setKey($key);
+
+        $actual = '';
+        for ($i = 0, $strlen = strlen($plaintext); $i < $strlen; ++$i) {
+            $actual .= $aes->decrypt($aes->encrypt($plaintext[$i]));
         }
+
+        $this->assertEquals($plaintext, $actual);
+    }
+
+    public function testKeyPaddingRijndael()
+    {
+        // this test case is from the following URL:
+        // https://web.archive.org/web/20070209120224/http://fp.gladman.plus.com/cryptography_technology/rijndael/aesdvec.zip
+
+        $aes = new Crypt_Rijndael();
+        $aes->disablePadding();
+        $aes->setKey(pack('H*', '2b7e151628aed2a6abf7158809cf4f3c762e7160')); // 160-bit key. Valid in Rijndael.
+        $ciphertext = $aes->encrypt(pack('H*', '3243f6a8885a308d313198a2e0370734'));
+        $this->assertEquals($ciphertext, pack('H*', '231d844639b31b412211cfe93712b880'));
+    }
+
+    public function testKeyPaddingAES()
+    {
+        // same as the above - just with a different ciphertext
+
+        $aes = new Crypt_AES();
+        $aes->disablePadding();
+        $aes->setKey(pack('H*', '2b7e151628aed2a6abf7158809cf4f3c762e7160')); // 160-bit key. AES should null pad to 192-bits
+        $ciphertext = $aes->encrypt(pack('H*', '3243f6a8885a308d313198a2e0370734'));
+        $this->assertEquals($ciphertext, pack('H*', 'c109292b173f841b88e0ee49f13db8c0'));
     }
 }
diff --git a/tests/Unit/Crypt/AES/mcryptTest.php b/tests/Unit/Crypt/AES/mcryptTest.php
new file mode 100644
index 00000000..f91e3bb5
--- /dev/null
+++ b/tests/Unit/Crypt/AES/mcryptTest.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright MMXIII Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+class Unit_Crypt_AES_mcryptTest extends Unit_Crypt_AES_mcryptCase
+{
+    static public function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        self::ensureConstant('CRYPT_AES_MODE', CRYPT_AES_MODE_MCRYPT);
+    }
+}
\ No newline at end of file