diff --git a/.circleci/config.yml b/.circleci/config.yml
index 50741184..b671c56b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  linter: talkiq/linter@1
+  linter: thekevjames/linter@1
 
 jobs:
   toxpy:
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 16be3232..83adbdf4 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [2.7, 3.4, 3.5, 3.6, 3.7]
+        python-version: [2.7, 3.5, 3.6, 3.7]
 
     steps:
     - uses: actions/checkout@v1
diff --git a/.travis.yml b/.travis.yml
index 90bb7267..b6481c69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ python:
   - 3.4
   - 3.5
   - pypy
-  - pypy3
 env:
   - $COVPYYAML=cov3-default,coveralls3
   - $COVPYYAML=cov4-pyyaml,coveralls4
@@ -18,7 +17,9 @@ matrix:
       dist: xenial  # https://github.com/travis-ci/travis-ci/issues/9815
       sudo: true
       env: $COVPYYAML=cov41-pyyaml,coveralls41
+    - python: pypy3
+      env: $COVPYYAML=cov41-pyyaml,coveralls41
 install:
-  - pip install tox tox-factor
+  - pip install tox
 script:
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')-$COVPYYAML