diff --git a/.travis.yml b/.travis.yml
index 6929e68..7725c45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,10 +42,11 @@ env:
     secure: "ldequnb5RP6xFsgwo4AOun12RURGFqeInrY162AMS1tVg0Wkq8JF+wTC30B4UjUxbHKmo5uRlILUA1E7mttAcKlOgITkFbdE+bNj0PaxfArUj8lN5ynyZuWZyUx/9zmuvL+BrA2hmTBsbaEWticnArijwXMrzpB6gvcitGOI9rky3n7ry9WZfCtOcFXNsjW29N+gbJ/K3yN4NadAuLSBVmRerkKuHC2OuWSgrq/I4naerjTm3JC5HXNEunojNWEuhcSWEoZfHpFUjn9ttjggKmGBNJS/sQU8B2/a5X9RtTI4FL8nO/jizm29nJVXc330xxJzaKXX0dIGJCm5SbL7yUQU3rQ7UHqV6G7OM3lgt3rfP2ph6WycEI1wnn5SVfm5E4+5BYsx1ApLj19lhHhXGefie5sKrVrcz993iXoIiJoIAbhU974vjOMBh6YwQLqmHbdJS86HUTAuQfxrznGdnZbQ95m0gjfmFMZedEEFtSvtiaK80wSgIwqPPThSAzz3NoSE+uPAkoJdJlbQa1tPVrWJXHSmnmw9q66/dyQ3OXShDgnq7rQ9yLCtKrQpdOFxXmmyvTA/UKl329T+bfff38szZLHOs/Hkqa0TFbvYZvJnQ7Gz+6Z7y4zmeSOBMRirynqWbqQfG6l7LSH8c/5xLw11xriiFf9w8TJ8+Ebv71g="
 matrix:
   allow_failures:
-    - python: "3.7"
+    # - python: "3.7"
     - python: "3.7-dev"
     - python: "3.8-dev"
     - python: "nightly"
+    - python: "pypy"
     - python: "pypy3"
     # - env: pandocVersion=1.13.2
     # - env: pandocVersion=1.14
diff --git a/setup.py b/setup.py
index 5b2338f..05ca426 100644
--- a/setup.py
+++ b/setup.py
@@ -72,8 +72,9 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy'
+        # 'Programming Language :: Python :: Implementation :: PyPy'
     ],
 
     # What does your project relate to?