diff --git a/.travis.yml b/.travis.yml
index 10e9de05d1..60e78ab63b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ install:
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION flake8 scipy=1.0.0 numpy freetype nose pandas=0.22.0 jupyter ipython=5.4.1 param matplotlib=2.1.2 xarray
   - source activate test-environment
   - conda install -c conda-forge  iris plotly flexx ffmpeg --quiet
-  - conda install -c bokeh datashader dask bokeh=0.12.14 selenium
+  - conda install -c bokeh datashader dask bokeh=0.12.15 selenium
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then
       conda install python=3.4.3;
     fi
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index b3e65395e9..87a13bcd89 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -23,7 +23,7 @@ requirements:
     - python
     - param >=1.6.0,<2.0
     - numpy
-    - matplotlib
+    - matplotlib>=2.1
     - bokeh>=0.12.14,<=0.12.15
     - jupyter
     - notebook
diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index c1e77b9976..fdc730068e 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import param
 import numpy as np
 
diff --git a/setup.py b/setup.py
index 39c67b38eb..eec9f88b98 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 extras_require['notebook-dependencies'] = ['ipython', 'pyzmq', 'jinja2', 'tornado',
                                            'jsonschema', 'notebook', 'pygments']
 # IPython Notebook + matplotlib
-extras_require['recommended'] = extras_require['notebook-dependencies'] + ['matplotlib', 'bokeh>=0.12.14,<=0.12.15']
+extras_require['recommended'] = extras_require['notebook-dependencies'] + ['matplotlib>=2.1', 'bokeh>=0.12.15']
 # Additional, useful third-party packages
 extras_require['extras'] = (['pandas', 'seaborn']
                             + extras_require['recommended'])
diff --git a/tests/testbokehcallbacks.py b/tests/testbokehcallbacks.py
index b0e7ad690d..84426eb998 100644
--- a/tests/testbokehcallbacks.py
+++ b/tests/testbokehcallbacks.py
@@ -12,7 +12,7 @@
     from holoviews.plotting.bokeh.util import bokeh_version
 
     from bokeh.events import Tap
-    from bokeh.models import Range1d, Plot, ColumnDataSource
+    from bokeh.models import Range1d, Plot
     bokeh_renderer = Store.renderers['bokeh']
 except:
     bokeh_renderer = None
@@ -81,12 +81,6 @@ def test_server_callback_resolve_attr_spec_range1d_end(self):
         msg = Callback.resolve_attr_spec('x_range.attributes.end', range1d)
         self.assertEqual(msg, {'id': range1d.ref['id'], 'value': 10})
 
-    def test_server_callback_resolve_attr_spec_source_selected(self):
-        source = ColumnDataSource()
-        source.selected['1d']['indices'] = [1, 2, 3]
-        msg = Callback.resolve_attr_spec('cb_obj.selected.1d.indices', source)
-        self.assertEqual(msg, {'id': source.ref['id'], 'value': [1, 2, 3]})
-
     def test_server_callback_resolve_attr_spec_tap_event(self):
         plot = Plot()
         event = Tap(plot, x=42)