diff --git a/.appveyor.yml b/.appveyor.yml
index 7d2c482b5..2059ceef6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -10,7 +10,7 @@ install:
   - "conda install -y -c pyviz pyctdev && doit ecosystem_setup"
   - "doit env_create %CHANNELS% --name=test --python=%PY%"
   - "activate test"
-  - "doit develop_install %CHANNELS%"
+  - "doit develop_install %CHANNELS% -o tests -o examples"
   # Fix for https://github.com/conda-forge/pytest-benchmark-feedstock/issues/6
   - "pip install pytest-benchmark --ignore-installed"
   # Fixes Cannot open include file: 'sys/un.h': No such file or directory
diff --git a/.travis.yml b/.travis.yml
index f0f5867ca..808d68638 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ env:
     - TMPDIR=$HOME/tmp
     - PYPI="https://upload.pypi.org/legacy/"
     - PYTHON_VERSION=3.6
-    - OPTS=""
+    - OPTS="-o tests -o examples"
 
 # quick hack to determine what tag is (improvements welcomed)
 #     release: ^v(\d+|\.)*[^a-z]\d*$
@@ -84,7 +84,7 @@ jobs:
     - &doc_build
       <<: *default
       stage: docs
-      env: HV_DOC_HTML="true" DESC="docs" OPTS="-o doc -o examples_extra"
+      env: HV_DOC_HTML="true" DESC="docs" OPTS="-o doc"
       script:
         - datashader fetch-data --path=examples --force
         - nbsite generate-rst --org pyviz --project-name datashader --skip '.*tiling.*,.*streaming-aggregation.*'
diff --git a/setup.py b/setup.py
index 8eee2a446..b2916b9f1 100644
--- a/setup.py
+++ b/setup.py
@@ -28,22 +28,25 @@
     'scipy',
 ]
 
+examples = [
+    'distributed', # dask
+    'holoviews >=1.10.0',
+    'matplotlib',
+    'pandas >=0.24.1',
+]
+
 extras_require = {
     'tests': [
         'pytest >=3.9.3',
         'pytest-benchmark >=3.0.0',
         'flake8',
-        'nbsmoke >=0.2.6',
+        'nbsmoke ==0.2.8',  # test pinning to allow hv.extension
         'fastparquet >=0.1.6',  # optional dependency
         'pandas >=0.24.1',  # optional ragged array support
     ],
-    'examples': [],
-    'examples_extra':[
-        'distributed', # dask
-        'holoviews >=1.10.0',
-        'matplotlib',
+    'examples': examples,
+    'examples_extra': examples + [
         'networkx >=2.0',
-        'pandas >=0.24.1',
         'streamz >=0.2.0',
         ### conda only below here
         'cartopy',