diff --git a/.travis.yml b/.travis.yml
index e6f04d9..72d6da7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
-  - "3.9-dev"
+  - "3.9"
   - "pypy3"
 install:
   - pip install .
diff --git a/idna/uts46data.py b/idna/uts46data.py
index f3d5609..8ae36cb 100644
--- a/idna/uts46data.py
+++ b/idna/uts46data.py
@@ -1,5 +1,4 @@
 # This file is automatically generated by tools/idna-data
-# vim: set fileencoding=utf-8 :
 
 """IDNA Mapping Table from UTS46."""
 
diff --git a/setup.py b/setup.py
index d7f3139..8f92932 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ def main():
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: 3.8',
+            'Programming Language :: Python :: 3.9',
             'Programming Language :: Python :: Implementation :: CPython',
             'Programming Language :: Python :: Implementation :: PyPy',
             'Topic :: Internet :: Name Service (DNS)',
diff --git a/tests/test_idna_codec.py b/tests/test_idna_codec.py
index 087b959..4aad3c2 100755
--- a/tests/test_idna_codec.py
+++ b/tests/test_idna_codec.py
@@ -23,12 +23,8 @@ def testIncrementalDecoder(self):
         )
 
         for decoded, encoded in incremental_tests:
-            if sys.version_info[0] == 2:
-                self.assertEqual("".join(codecs.iterdecode(encoded, "idna")),
-                                decoded)
-            else:
-                self.assertEqual("".join(codecs.iterdecode((bytes([c]) for c in encoded), "idna")),
-                                decoded)
+            self.assertEqual("".join(codecs.iterdecode((bytes([c]) for c in encoded), "idna")),
+                             decoded)
 
         decoder = codecs.getincrementaldecoder("idna")()
         self.assertEqual(decoder.decode(b"xn--xam", ), "")