diff --git a/.travis.yml b/.travis.yml
index 6b23c38..15eb589 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ language: python
 os: linux
 jobs:
   include:
+    - python: "3.10"
+      env: TOXENV=py310
+      dist: bionic
     - python: "3.9"
       env: TOXENV=py39
     - python: "3.8"
@@ -10,18 +13,28 @@ jobs:
     - python: "3.7"
       env: TOXENV=py37
       dist: xenial
+      before_install:
+        # Fix "AttributeError: 'str' object has no attribute 'name'" on Py37
+        - pip install -U importlib_metadata
     - python: "3.6"
       env: TOXENV=py36
-    # - python: "3.5"  # EOL 2020-09-13
+      before_install:
+      # Fix for cryptography on Py36
+      - pip install --upgrade virtualenv
+  # - python: "3.5"  # EOL 2020-09-13
     #   env: TOXENV=py35
-    - python: "3.10-dev"
-      env: TOXENV=py310
+    - python: "3.11-dev"
+      env: TOXENV=py311
+      dist: bionic
   allow_failures:
-    - python: "3.10-dev"
-      env: TOXENV=py310
-before_install:
-  # Fix for cryptography on Py36
-  - pip install --upgrade virtualenv
+    - python: "3.11-dev"
+      env: TOXENV=py311
+      dist: bionic
+
+# before_install:
+#   # Fix for cryptography on Py36
+#   - pip install --upgrade virtualenv
+
 install:
   - pip install tox-travis flake8 coveralls coverage isort
 script:
diff --git a/setup.cfg b/setup.cfg
index f0d3d71..336f3ff 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,10 +15,10 @@ long_description = file: README.md
 long_description_content_type = text/markdown
 keywords = build, setup, ci, workflow, automation
 license = MIT
-license_file = LICENSE.txt
+license_files = LICENSE.txt
 classifiers =
-    Development Status :: 3 - Alpha
-    # Development Status :: 4 - Beta
+    # Development Status :: 3 - Alpha
+    Development Status :: 4 - Beta
     # Development Status :: 5 - Production/Stable
     Environment :: Console
     Intended Audience :: Developers
@@ -31,6 +31,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Topic :: Software Development :: Build Tools
     Topic :: System :: Installation/Setup
     Topic :: System :: Software Distribution