diff --git a/.appveyor.yml b/.appveyor.yml
index 80d4cb3..5f51e8e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: '0.6.0-rev{build}'
+version: '0.6.1-rev{build}'
 clone_depth: 5
 environment:
   TARGET: x86_64-pc-windows-msvc
diff --git a/.travis.yml b/.travis.yml
index 863ccda..47b89ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,30 +56,43 @@ stages:
 jobs:
   include:
     # Linux
-    # - python: 3.5
-    #   <<: *test-python
-    # - python: 3.6
-    #   <<: *test-python
-    # - python: 3.7
-    #   <<: *test-python
-    # - python: 3.8
-    #   <<: *test-python
-    # - python: pypy3
-    #   <<: *test-python
+    - python: 3.5
+      if: tag IS present
+      <<: *test-python
+    - python: 3.6
+      if: tag IS present
+      <<: *test-python
+    - python: 3.7
+      if: tag IS present
+      <<: *test-python
+    - python: 3.8
+      <<: *test-python
+    - python: pypy3
+      if: tag IS present
+      <<: *test-python
+    - python: pypy3.5
+      if: tag IS present
+      <<: *test-python
     # OSX
     - env: PYTHON=python3.5
+      if: tag IS present
+      <<: *test-python-osx
+    - env: PYTHON=python3.6
+      if: tag IS present
+      <<: *test-python-osx
+    - env: PYTHON=python3.6
+      if: tag IS present
+      <<: *test-python-osx
+    - env: PYTHON=python3.7
+      if: tag IS present
+      <<: *test-python-osx
+    - env: PYTHON=python3.8
+      <<: *test-python-osx
+    - env: PYTHON=pypy3.6
+      if: tag IS present
       <<: *test-python-osx
-    #- env: PYTHON=python3.6
-    #  <<: *test-python-osx
-    #- env: PYTHON=python3.6
-    #  <<: *test-python-osx
-    #- env: PYTHON=python3.7
-    #  <<: *test-python-osx
-    #- env: PYTHON=python3.8
-    #  <<: *test-python-osx
-    #- env: PYTHON=pypy3.6
-    #  <<: *test-python-osx
     - env: PYTHON=pypy3.7
+      if: tag IS present
       <<: *test-python-osx
 
 deploy:
diff --git a/ci/travis/osx/after_success.sh b/ci/travis/osx/after_success.sh
index 4e93a68..f0a525f 100755
--- a/ci/travis/osx/after_success.sh
+++ b/ci/travis/osx/after_success.sh
@@ -13,7 +13,7 @@ fi
 # --- Patch version number ---------------------------------------------------
 
 if [ -z "$TRAVIS_TAG" ]; then
-  VERSION=$($PYTHON setup.py --version)-dev$(git rev-list --count --all)
+  VERSION=$(python setup.py --version)-dev$(git rev-list --count --all)
   sed -i'.BAK' -e "s/version = $($PYTHON setup.py --version)/version = $VERSION/g" setup.cfg
 fi