diff --git a/.travis.yml b/.travis.yml
index b433c56..f83f5a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
 
 install:
   - pip install .
@@ -14,7 +15,7 @@ install:
 script:
   - pep8 amodem/ scripts/
   - echo "Hello World!" | amodem send -vv -l- -o- | amodem recv -vv -l- -i-
-  - coverage run --source=amodem --omit="*/__main__.py" -m py.test -vvs
+  - coverage run --source=amodem --omit="*/__main__.py" -m py.test -vvs --assert=plain
 
 after_success:
   - coverage report
diff --git a/setup.py b/setup.py
index 7027b67..e556710 100644
--- a/setup.py
+++ b/setup.py
@@ -48,6 +48,7 @@ setup(
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: System :: Networking',
         'Topic :: Communications',