diff --git a/ci/install.sh b/ci/install.sh
index 61f41a2..02283b2 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -15,11 +15,17 @@ conda install -q ciocheck -c spyder-ide --no-update-deps
 
 # Install dependencies
 if [ "$CIRCLE_NODE_INDEX" = "0" ]; then
-    pip install -q markdown pygments ipython nbformat nbconvert jupyter_client pyqt5 matplotlib
+    # python3.6, pweave from git/master
+    pip install -q matplotlib
     pip install git+ssh://git@github.com/mpastell/Pweave.git
-else
+elif [ "$CIRCLE_NODE_INDEX" = "1" ]; then
+    # python3.5, latest pweave 0.30
     conda install -q matplotlib pandoc
     pip install -q pweave
+else
+    # python2.7, legacy pweave 0.25 :(
+    conda install -q matplotlib
+    pip install -q pweave==0.25
 fi
 
 # Bring Spyder dependencies (install/uninstall Spyder)
diff --git a/circle.yml b/circle.yml
index 359fd78..b7cc18b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,9 +4,9 @@ machine:
   environment:
     # Python versions to tests (Maximum of 4 different versions)
     # The last container is used to test with pyqt5 wheels
-    # python3.6. pip, pweave 0.3alpha from git/master
-    # python3.5 conda, pweave 0.2.5
-    # python2.7 conda, pweave 0.2.5
+    # python3.6, pweave from git/master
+    # python3.5, latest pweave 0.30
+    # python2.7, legacy pweave 0.25 :(
     PY_VERSIONS: "3.6 3.5 2.7"
     # Environment variables used by astropy helpers
     TRAVIS_OS_NAME: "linux"