1 files changed, 8 insertions, 10 deletions
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
index 8cba8c66..ad3626af 100644
--- a/tests/hazmat/primitives/test_aes.py
+++ b/tests/hazmat/primitives/test_aes.py
@@ -21,9 +21,7 @@ import pytest
 from cryptography.hazmat.primitives.ciphers import algorithms, modes
 
 from .utils import generate_encrypt_test, generate_aead_test
-from ...utils import (
-    load_nist_vectors, load_openssl_vectors,
-)
+from ...utils import load_nist_vectors
 
 
 @pytest.mark.supported(
@@ -33,7 +31,7 @@ from ...utils import (
     skip_message="Does not support AES CBC",
 )
 @pytest.mark.cipher
-class TestAES_CBC(object):
+class TestAESModeCBC(object):
     test_CBC = generate_encrypt_test(
         load_nist_vectors,
         os.path.join("ciphers", "AES", "CBC"),
@@ -66,7 +64,7 @@ class TestAES_CBC(object):
     skip_message="Does not support AES ECB",
 )
 @pytest.mark.cipher
-class TestAES_ECB(object):
+class TestAESModeECB(object):
     test_ECB = generate_encrypt_test(
         load_nist_vectors,
         os.path.join("ciphers", "AES", "ECB"),
@@ -99,7 +97,7 @@ class TestAES_ECB(object):
     skip_message="Does not support AES OFB",
 )
 @pytest.mark.cipher
-class TestAES_OFB(object):
+class TestAESModeOFB(object):
     test_OFB = generate_encrypt_test(
         load_nist_vectors,
         os.path.join("ciphers", "AES", "OFB"),
@@ -132,7 +130,7 @@ class TestAES_OFB(object):
     skip_message="Does not support AES CFB",
 )
 @pytest.mark.cipher
-class TestAES_CFB(object):
+class TestAESModeCFB(object):
     test_CFB = generate_encrypt_test(
         load_nist_vectors,
         os.path.join("ciphers", "AES", "CFB"),
@@ -165,9 +163,9 @@ class TestAES_CFB(object):
     skip_message="Does not support AES CTR",
 )
 @pytest.mark.cipher
-class TestAES_CTR(object):
+class TestAESModeCTR(object):
     test_CTR = generate_encrypt_test(
-        load_openssl_vectors,
+        load_nist_vectors,
         os.path.join("ciphers", "AES", "CTR"),
         ["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"],
         lambda key, **kwargs: algorithms.AES(binascii.unhexlify(key)),
@@ -182,7 +180,7 @@ class TestAES_CTR(object):
     skip_message="Does not support AES GCM",
 )
 @pytest.mark.cipher
-class TestAES_GCM(object):
+class TestAESModeGCM(object):
     test_GCM = generate_aead_test(
         load_nist_vectors,
         os.path.join("ciphers", "AES", "GCM"),