diff --git a/GPy/testing/plotting_tests.py b/GPy/testing/plotting_tests.py
index ec58625a..78d351a8 100644
--- a/GPy/testing/plotting_tests.py
+++ b/GPy/testing/plotting_tests.py
@@ -27,13 +27,15 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #===============================================================================
+import matplotlib
+matplotlib.use('agg')
+
 import numpy as np
 import GPy, os
 from nose import SkipTest
 
 from ..util.config import config
 from ..plotting import change_plotting_library
-import unittest
 
 change_plotting_library('matplotlib')
 if config.get('plotting', 'library') != 'matplotlib':
@@ -73,7 +75,7 @@ def _sequenceEqual(a, b):
 def _notFound(path):
     raise IOError('File {} not in baseline')
 
-def _image_comparison(baseline_images, extensions=['pdf','svg','ong'], tol=11):
+def _image_comparison(baseline_images, extensions=['pdf','svg','png'], tol=11):
     baseline_dir, result_dir = _image_directories()
     for num, base in zip(plt.get_fignums(), baseline_images):
         for ext in extensions:
diff --git a/setup.py b/setup.py
index f4dcfcda..e143d364 100644
--- a/setup.py
+++ b/setup.py
@@ -126,14 +126,14 @@ setup(name = 'GPy',
                   "GPy.plotting.plotly_dep",
                   ],
       package_dir={'GPy': 'GPy'},
-      package_data = {'GPy': ['defaults.cfg', 'installation.cfg',
-                              'util/data_resources.json',
-                              'util/football_teams.json',
-                              'testing/plotting_tests/baseline/*.png'
-                              ]},
-      data_files=[('GPy/testing/plotting_tests/baseline', 'testing/plotting_tests/baseline/*.png'),
-                  ('GPy/testing/', 'GPy/testing/pickle_test.pickle'),
-                   ],
+      #package_data = {'GPy': ['defaults.cfg', 'installation.cfg',
+      #                        'util/data_resources.json',
+      #                        'util/football_teams.json',
+      #                        'testing/plotting_tests/baseline/*.png'
+      #                        ]},
+      #data_files=[('GPy/testing/plotting_tests/baseline', 'testing/plotting_tests/baseline/*.png'),
+      #            ('GPy/testing/', 'GPy/testing/pickle_test.pickle'),
+      #             ],
       include_package_data = True,
       py_modules = ['GPy.__init__'],
       test_suite = 'GPy.testing',
diff --git a/travis_tests.py b/travis_tests.py
index 5d0b3a0b..79a75f54 100644
--- a/travis_tests.py
+++ b/travis_tests.py
@@ -30,6 +30,9 @@
 #===============================================================================
 
 #!/usr/bin/env python
+import matplotlib
+matplotlib.use('agg')
+
 import nose
 nose.main('GPy', defaultTest='GPy/testing/')