diff --git a/.travis.yml b/.travis.yml
index 9710537..cf6ecef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@
     - TOX_ENV=pypy CC=clang
     - TOX_ENV=docs
     - TOX_ENV=pep8
+    - TOX_ENV=py3pep8
 
 install:
     - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true"
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
index 0caac3b..192da64 100644
--- a/tests/hazmat/primitives/test_aes.py
+++ b/tests/hazmat/primitives/test_aes.py
@@ -11,10 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""
-Test using the NIST Test Vectors
-"""
-
 from __future__ import absolute_import, division, print_function
 
 import binascii
@@ -28,7 +24,7 @@
 )
 
 
-class TestAES_CBC(object):
+class TestAES(object):
     test_CBC = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "CBC"),
@@ -53,8 +49,6 @@
         lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
     )
 
-
-class TestAES_ECB(object):
     test_ECB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "ECB"),
@@ -79,8 +73,6 @@
         lambda key: modes.ECB(),
     )
 
-
-class TestAES_OFB(object):
     test_OFB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "OFB"),
@@ -105,8 +97,6 @@
         lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
     )
 
-
-class TestAES_CFB(object):
     test_CFB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "CFB"),
@@ -131,8 +121,6 @@
         lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
     )
 
-
-class TestAES_CTR(object):
     test_CTR = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "AES", "CTR"),
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py
index 46e724b..605c18d 100644
--- a/tests/hazmat/primitives/test_camellia.py
+++ b/tests/hazmat/primitives/test_camellia.py
@@ -11,10 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""
-Tests using the CRYPTREC (Camellia) Test Vectors
-"""
-
 from __future__ import absolute_import, division, print_function
 
 import binascii
@@ -28,7 +24,7 @@
 )
 
 
-class TestCamelliaECB(object):
+class TestCamellia(object):
     test_ECB = generate_encrypt_test(
         load_cryptrec_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
@@ -45,8 +41,6 @@
         skip_message="Does not support Camellia ECB",
     )
 
-
-class TestCamelliaCBC(object):
     test_CBC = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
@@ -59,8 +53,6 @@
         skip_message="Does not support Camellia CBC",
     )
 
-
-class TestCamelliaOFB(object):
     test_OFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
@@ -73,8 +65,6 @@
         skip_message="Does not support Camellia OFB",
     )
 
-
-class TestCamelliaCFB(object):
     test_CFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
diff --git a/tox.ini b/tox.ini
index 92bcb75..b01aeb7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py32,py33,docs,pep8
+envlist = py26,py27,pypy,py32,py33,docs,pep8,py3pep8
 
 [testenv]
 deps =
@@ -22,5 +22,10 @@
 deps = flake8
 commands = flake8 .
 
+[testenv:py3pep8]
+basepython = python3.3
+deps = flake8
+commands = flake8 .
+
 [flake8]
 exclude = .tox,*.egg