diff --git a/tests/hazmat/primitives/test_3des.py b/tests/hazmat/primitives/test_3des.py
index d5188ff..6b3e041 100644
--- a/tests/hazmat/primitives/test_3des.py
+++ b/tests/hazmat/primitives/test_3des.py
@@ -29,7 +29,7 @@
 class TestTripleDES_CBC(object):
     test_KAT = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "3DES", "KAT"),
+        os.path.join("ciphers", "3DES", "CBC"),
         [
             "TCBCinvperm.rsp",
             "TCBCpermop.rsp",
@@ -43,7 +43,7 @@
 
     test_MMT = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "3DES", "MMT"),
+        os.path.join("ciphers", "3DES", "CBC"),
         [
             "TCBCMMT1.rsp",
             "TCBCMMT2.rsp",
@@ -59,7 +59,7 @@
 class TestTripleDES_OFB(object):
     test_KAT = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "3DES", "KAT"),
+        os.path.join("ciphers", "3DES", "OFB"),
         [
             "TOFBpermop.rsp",
             "TOFBsubtab.rsp",
@@ -73,7 +73,7 @@
 
     test_MMT = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "3DES", "MMT"),
+        os.path.join("ciphers", "3DES", "OFB"),
         [
             "TOFBMMT1.rsp",
             "TOFBMMT2.rsp",
@@ -89,7 +89,7 @@
 class TestTripleDES_CFB(object):
     test_KAT = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "3DES", "KAT"),
+        os.path.join("ciphers", "3DES", "CFB"),
         [
             "TCFB64invperm.rsp",
             "TCFB64permop.rsp",
@@ -103,7 +103,7 @@
 
     test_MMT = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "3DES", "MMT"),
+        os.path.join("ciphers", "3DES", "CFB"),
         [
             "TCFB64MMT1.rsp",
             "TCFB64MMT2.rsp",
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
index e853a0b..0caac3b 100644
--- a/tests/hazmat/primitives/test_aes.py
+++ b/tests/hazmat/primitives/test_aes.py
@@ -29,9 +29,9 @@
 
 
 class TestAES_CBC(object):
-    test_KAT = generate_encrypt_test(
+    test_CBC = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "KAT"),
+        os.path.join("ciphers", "AES", "CBC"),
         [
             "CBCGFSbox128.rsp",
             "CBCGFSbox192.rsp",
@@ -45,15 +45,6 @@
             "CBCVarTxt128.rsp",
             "CBCVarTxt192.rsp",
             "CBCVarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "MMT"),
-        [
             "CBCMMT128.rsp",
             "CBCMMT192.rsp",
             "CBCMMT256.rsp",
@@ -64,9 +55,9 @@
 
 
 class TestAES_ECB(object):
-    test_KAT = generate_encrypt_test(
+    test_ECB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "KAT"),
+        os.path.join("ciphers", "AES", "ECB"),
         [
             "ECBGFSbox128.rsp",
             "ECBGFSbox192.rsp",
@@ -80,15 +71,6 @@
             "ECBVarTxt128.rsp",
             "ECBVarTxt192.rsp",
             "ECBVarTxt256.rsp",
-        ],
-        lambda key: ciphers.AES(binascii.unhexlify(key)),
-        lambda key: modes.ECB(),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "MMT"),
-        [
             "ECBMMT128.rsp",
             "ECBMMT192.rsp",
             "ECBMMT256.rsp",
@@ -99,9 +81,9 @@
 
 
 class TestAES_OFB(object):
-    test_KAT = generate_encrypt_test(
+    test_OFB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "KAT"),
+        os.path.join("ciphers", "AES", "OFB"),
         [
             "OFBGFSbox128.rsp",
             "OFBGFSbox192.rsp",
@@ -115,15 +97,6 @@
             "OFBVarTxt128.rsp",
             "OFBVarTxt192.rsp",
             "OFBVarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "MMT"),
-        [
             "OFBMMT128.rsp",
             "OFBMMT192.rsp",
             "OFBMMT256.rsp",
@@ -134,9 +107,9 @@
 
 
 class TestAES_CFB(object):
-    test_KAT = generate_encrypt_test(
+    test_CFB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "KAT"),
+        os.path.join("ciphers", "AES", "CFB"),
         [
             "CFB128GFSbox128.rsp",
             "CFB128GFSbox192.rsp",
@@ -150,15 +123,6 @@
             "CFB128VarTxt128.rsp",
             "CFB128VarTxt192.rsp",
             "CFB128VarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("ciphers", "AES", "MMT"),
-        [
             "CFB128MMT128.rsp",
             "CFB128MMT192.rsp",
             "CFB128MMT256.rsp",
@@ -169,7 +133,7 @@
 
 
 class TestAES_CTR(object):
-    test_OpenSSL = generate_encrypt_test(
+    test_CTR = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "AES", "CTR"),
         ["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"],
diff --git a/tests/hazmat/primitives/test_hash_vectors.py b/tests/hazmat/primitives/test_hash_vectors.py
index 5fbd7d4..5c3e72d 100644
--- a/tests/hazmat/primitives/test_hash_vectors.py
+++ b/tests/hazmat/primitives/test_hash_vectors.py
@@ -24,7 +24,7 @@
 class TestSHA1(object):
     test_SHA1 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("hashes", "SHABYTE"),
+        os.path.join("hashes", "SHA1"),
         [
             "SHA1LongMsg.rsp",
             "SHA1ShortMsg.rsp",
@@ -38,7 +38,7 @@
 class TestSHA224(object):
     test_SHA224 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("hashes", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA224LongMsg.rsp",
             "SHA224ShortMsg.rsp",
@@ -52,7 +52,7 @@
 class TestSHA256(object):
     test_SHA256 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("hashes", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA256LongMsg.rsp",
             "SHA256ShortMsg.rsp",
@@ -66,7 +66,7 @@
 class TestSHA384(object):
     test_SHA384 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("hashes", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA384LongMsg.rsp",
             "SHA384ShortMsg.rsp",
@@ -80,7 +80,7 @@
 class TestSHA512(object):
     test_SHA512 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("hashes", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA512LongMsg.rsp",
             "SHA512ShortMsg.rsp",
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 93bae01..0692c8d 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -134,7 +134,7 @@
 
 def test_load_nist_vectors_from_file_encrypt():
     assert load_nist_vectors_from_file(
-        os.path.join("ciphers", "AES", "KAT", "CBCGFSbox128.rsp"),
+        os.path.join("ciphers", "AES", "CBC", "CBCGFSbox128.rsp"),
         "ENCRYPT"
     ) == [
         {
@@ -184,7 +184,7 @@
 
 def test_load_nist_vectors_from_file_decrypt():
     assert load_nist_vectors_from_file(
-        os.path.join("ciphers", "AES", "KAT", "CBCGFSbox128.rsp"),
+        os.path.join("ciphers", "AES", "CBC", "CBCGFSbox128.rsp"),
         "DECRYPT",
     ) == [
         {