diff --git a/GPy/testing/baseline/bayesian_gplvm_gradient.png b/GPy/testing/baseline/bayesian_gplvm_gradient.png
new file mode 100644
index 00000000..b38967c5
Binary files /dev/null and b/GPy/testing/baseline/bayesian_gplvm_gradient.png differ
diff --git a/GPy/testing/baseline/bayesian_gplvm_gradient.svg b/GPy/testing/baseline/bayesian_gplvm_gradient.svg
deleted file mode 100644
index b99a68b3..00000000
--- a/GPy/testing/baseline/bayesian_gplvm_gradient.svg
+++ /dev/null
@@ -1,1649 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/bayesian_gplvm_inducing.png b/GPy/testing/baseline/bayesian_gplvm_inducing.png
new file mode 100644
index 00000000..5be11441
Binary files /dev/null and b/GPy/testing/baseline/bayesian_gplvm_inducing.png differ
diff --git a/GPy/testing/baseline/bayesian_gplvm_inducing.svg b/GPy/testing/baseline/bayesian_gplvm_inducing.svg
deleted file mode 100644
index 3f154b8c..00000000
--- a/GPy/testing/baseline/bayesian_gplvm_inducing.svg
+++ /dev/null
@@ -1,856 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png b/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png
new file mode 100644
index 00000000..b9c87203
Binary files /dev/null and b/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png differ
diff --git a/GPy/testing/baseline/bayesian_gplvm_inducing_3d.svg b/GPy/testing/baseline/bayesian_gplvm_inducing_3d.svg
deleted file mode 100644
index 3710da23..00000000
--- a/GPy/testing/baseline/bayesian_gplvm_inducing_3d.svg
+++ /dev/null
@@ -1,1084 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/bayesian_gplvm_latent.png b/GPy/testing/baseline/bayesian_gplvm_latent.png
new file mode 100644
index 00000000..640d6fa4
Binary files /dev/null and b/GPy/testing/baseline/bayesian_gplvm_latent.png differ
diff --git a/GPy/testing/baseline/bayesian_gplvm_latent.svg b/GPy/testing/baseline/bayesian_gplvm_latent.svg
deleted file mode 100644
index e4fd0d46..00000000
--- a/GPy/testing/baseline/bayesian_gplvm_latent.svg
+++ /dev/null
@@ -1,1047 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/bayesian_gplvm_latent_3d.png b/GPy/testing/baseline/bayesian_gplvm_latent_3d.png
new file mode 100644
index 00000000..f35b47c3
Binary files /dev/null and b/GPy/testing/baseline/bayesian_gplvm_latent_3d.png differ
diff --git a/GPy/testing/baseline/bayesian_gplvm_latent_3d.svg b/GPy/testing/baseline/bayesian_gplvm_latent_3d.svg
deleted file mode 100644
index 899f56ff..00000000
--- a/GPy/testing/baseline/bayesian_gplvm_latent_3d.svg
+++ /dev/null
@@ -1,1418 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/bayesian_gplvm_magnification.png b/GPy/testing/baseline/bayesian_gplvm_magnification.png
new file mode 100644
index 00000000..132d9139
Binary files /dev/null and b/GPy/testing/baseline/bayesian_gplvm_magnification.png differ
diff --git a/GPy/testing/baseline/bayesian_gplvm_magnification.svg b/GPy/testing/baseline/bayesian_gplvm_magnification.svg
deleted file mode 100644
index f56949ad..00000000
--- a/GPy/testing/baseline/bayesian_gplvm_magnification.svg
+++ /dev/null
@@ -1,1047 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/coverage_3d_plot.png b/GPy/testing/baseline/coverage_3d_plot.png
new file mode 100644
index 00000000..eee1fda8
Binary files /dev/null and b/GPy/testing/baseline/coverage_3d_plot.png differ
diff --git a/GPy/testing/baseline/coverage_3d_plot.svg b/GPy/testing/baseline/coverage_3d_plot.svg
deleted file mode 100644
index 8414c3fd..00000000
--- a/GPy/testing/baseline/coverage_3d_plot.svg
+++ /dev/null
@@ -1,905 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/coverage_annotation_interact.png b/GPy/testing/baseline/coverage_annotation_interact.png
new file mode 100644
index 00000000..ccf46609
Binary files /dev/null and b/GPy/testing/baseline/coverage_annotation_interact.png differ
diff --git a/GPy/testing/baseline/coverage_annotation_interact.svg b/GPy/testing/baseline/coverage_annotation_interact.svg
deleted file mode 100644
index 4bd8aed1..00000000
--- a/GPy/testing/baseline/coverage_annotation_interact.svg
+++ /dev/null
@@ -1,478 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/coverage_gradient.png b/GPy/testing/baseline/coverage_gradient.png
new file mode 100644
index 00000000..37df285c
Binary files /dev/null and b/GPy/testing/baseline/coverage_gradient.png differ
diff --git a/GPy/testing/baseline/coverage_gradient.svg b/GPy/testing/baseline/coverage_gradient.svg
deleted file mode 100644
index 75d12188..00000000
--- a/GPy/testing/baseline/coverage_gradient.svg
+++ /dev/null
@@ -1,897 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/coverage_imshow_interact.png b/GPy/testing/baseline/coverage_imshow_interact.png
new file mode 100644
index 00000000..1492a44e
Binary files /dev/null and b/GPy/testing/baseline/coverage_imshow_interact.png differ
diff --git a/GPy/testing/baseline/coverage_imshow_interact.svg b/GPy/testing/baseline/coverage_imshow_interact.svg
deleted file mode 100644
index 9c111898..00000000
--- a/GPy/testing/baseline/coverage_imshow_interact.svg
+++ /dev/null
@@ -1,364 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_2d_data.png b/GPy/testing/baseline/gp_2d_data.png
new file mode 100644
index 00000000..b05cd33a
Binary files /dev/null and b/GPy/testing/baseline/gp_2d_data.png differ
diff --git a/GPy/testing/baseline/gp_2d_data.svg b/GPy/testing/baseline/gp_2d_data.svg
deleted file mode 100644
index b2d34f8a..00000000
--- a/GPy/testing/baseline/gp_2d_data.svg
+++ /dev/null
@@ -1,576 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_2d_in_error.png b/GPy/testing/baseline/gp_2d_in_error.png
new file mode 100644
index 00000000..239c0cf1
Binary files /dev/null and b/GPy/testing/baseline/gp_2d_in_error.png differ
diff --git a/GPy/testing/baseline/gp_2d_in_error.svg b/GPy/testing/baseline/gp_2d_in_error.svg
deleted file mode 100644
index 2c3c4223..00000000
--- a/GPy/testing/baseline/gp_2d_in_error.svg
+++ /dev/null
@@ -1,870 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_2d_inducing.png b/GPy/testing/baseline/gp_2d_inducing.png
new file mode 100644
index 00000000..a27f518a
Binary files /dev/null and b/GPy/testing/baseline/gp_2d_inducing.png differ
diff --git a/GPy/testing/baseline/gp_2d_inducing.svg b/GPy/testing/baseline/gp_2d_inducing.svg
deleted file mode 100644
index e97547fa..00000000
--- a/GPy/testing/baseline/gp_2d_inducing.svg
+++ /dev/null
@@ -1,702 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_2d_mean.png b/GPy/testing/baseline/gp_2d_mean.png
new file mode 100644
index 00000000..a039a18f
Binary files /dev/null and b/GPy/testing/baseline/gp_2d_mean.png differ
diff --git a/GPy/testing/baseline/gp_2d_mean.svg b/GPy/testing/baseline/gp_2d_mean.svg
deleted file mode 100644
index a1d85f95..00000000
--- a/GPy/testing/baseline/gp_2d_mean.svg
+++ /dev/null
@@ -1,1764 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_3d_data.png b/GPy/testing/baseline/gp_3d_data.png
new file mode 100644
index 00000000..ae00c349
Binary files /dev/null and b/GPy/testing/baseline/gp_3d_data.png differ
diff --git a/GPy/testing/baseline/gp_3d_data.svg b/GPy/testing/baseline/gp_3d_data.svg
deleted file mode 100644
index b251c59c..00000000
--- a/GPy/testing/baseline/gp_3d_data.svg
+++ /dev/null
@@ -1,783 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_3d_inducing.png b/GPy/testing/baseline/gp_3d_inducing.png
new file mode 100644
index 00000000..75891947
Binary files /dev/null and b/GPy/testing/baseline/gp_3d_inducing.png differ
diff --git a/GPy/testing/baseline/gp_3d_inducing.svg b/GPy/testing/baseline/gp_3d_inducing.svg
deleted file mode 100644
index e77acba7..00000000
--- a/GPy/testing/baseline/gp_3d_inducing.svg
+++ /dev/null
@@ -1,917 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_3d_mean.png b/GPy/testing/baseline/gp_3d_mean.png
new file mode 100644
index 00000000..85fb2f7a
Binary files /dev/null and b/GPy/testing/baseline/gp_3d_mean.png differ
diff --git a/GPy/testing/baseline/gp_3d_mean.svg b/GPy/testing/baseline/gp_3d_mean.svg
deleted file mode 100644
index 2488657d..00000000
--- a/GPy/testing/baseline/gp_3d_mean.svg
+++ /dev/null
@@ -1,9878 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_class_likelihood.png b/GPy/testing/baseline/gp_class_likelihood.png
new file mode 100644
index 00000000..bc8eb686
Binary files /dev/null and b/GPy/testing/baseline/gp_class_likelihood.png differ
diff --git a/GPy/testing/baseline/gp_class_likelihood.svg b/GPy/testing/baseline/gp_class_likelihood.svg
deleted file mode 100644
index 5f49a90e..00000000
--- a/GPy/testing/baseline/gp_class_likelihood.svg
+++ /dev/null
@@ -1,1504 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_class_raw.png b/GPy/testing/baseline/gp_class_raw.png
new file mode 100644
index 00000000..ec1f5dcf
Binary files /dev/null and b/GPy/testing/baseline/gp_class_raw.png differ
diff --git a/GPy/testing/baseline/gp_class_raw.svg b/GPy/testing/baseline/gp_class_raw.svg
deleted file mode 100644
index cd61f8d6..00000000
--- a/GPy/testing/baseline/gp_class_raw.svg
+++ /dev/null
@@ -1,1267 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_class_raw_link.png b/GPy/testing/baseline/gp_class_raw_link.png
new file mode 100644
index 00000000..c036e55e
Binary files /dev/null and b/GPy/testing/baseline/gp_class_raw_link.png differ
diff --git a/GPy/testing/baseline/gp_class_raw_link.svg b/GPy/testing/baseline/gp_class_raw_link.svg
deleted file mode 100644
index 4865ae09..00000000
--- a/GPy/testing/baseline/gp_class_raw_link.svg
+++ /dev/null
@@ -1,1509 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_conf.png b/GPy/testing/baseline/gp_conf.png
new file mode 100644
index 00000000..d2a167f6
Binary files /dev/null and b/GPy/testing/baseline/gp_conf.png differ
diff --git a/GPy/testing/baseline/gp_conf.svg b/GPy/testing/baseline/gp_conf.svg
deleted file mode 100644
index cc3c8ce5..00000000
--- a/GPy/testing/baseline/gp_conf.svg
+++ /dev/null
@@ -1,903 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_data.png b/GPy/testing/baseline/gp_data.png
new file mode 100644
index 00000000..0db86377
Binary files /dev/null and b/GPy/testing/baseline/gp_data.png differ
diff --git a/GPy/testing/baseline/gp_data.svg b/GPy/testing/baseline/gp_data.svg
deleted file mode 100644
index f049e26c..00000000
--- a/GPy/testing/baseline/gp_data.svg
+++ /dev/null
@@ -1,582 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_density.png b/GPy/testing/baseline/gp_density.png
new file mode 100644
index 00000000..3e8a63cb
Binary files /dev/null and b/GPy/testing/baseline/gp_density.png differ
diff --git a/GPy/testing/baseline/gp_density.svg b/GPy/testing/baseline/gp_density.svg
deleted file mode 100644
index c8c1df87..00000000
--- a/GPy/testing/baseline/gp_density.svg
+++ /dev/null
@@ -1,28427 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_in_error.png b/GPy/testing/baseline/gp_in_error.png
new file mode 100644
index 00000000..a8f6645a
Binary files /dev/null and b/GPy/testing/baseline/gp_in_error.png differ
diff --git a/GPy/testing/baseline/gp_in_error.svg b/GPy/testing/baseline/gp_in_error.svg
deleted file mode 100644
index 848d2bfb..00000000
--- a/GPy/testing/baseline/gp_in_error.svg
+++ /dev/null
@@ -1,726 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_mean.png b/GPy/testing/baseline/gp_mean.png
new file mode 100644
index 00000000..63dc710c
Binary files /dev/null and b/GPy/testing/baseline/gp_mean.png differ
diff --git a/GPy/testing/baseline/gp_mean.svg b/GPy/testing/baseline/gp_mean.svg
deleted file mode 100644
index 0ba645b7..00000000
--- a/GPy/testing/baseline/gp_mean.svg
+++ /dev/null
@@ -1,601 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_out_error.png b/GPy/testing/baseline/gp_out_error.png
new file mode 100644
index 00000000..3003fb48
Binary files /dev/null and b/GPy/testing/baseline/gp_out_error.png differ
diff --git a/GPy/testing/baseline/gp_out_error.svg b/GPy/testing/baseline/gp_out_error.svg
deleted file mode 100644
index 9af85dca..00000000
--- a/GPy/testing/baseline/gp_out_error.svg
+++ /dev/null
@@ -1,780 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gp_samples.png b/GPy/testing/baseline/gp_samples.png
new file mode 100644
index 00000000..d2139c6b
Binary files /dev/null and b/GPy/testing/baseline/gp_samples.png differ
diff --git a/GPy/testing/baseline/gp_samples.svg b/GPy/testing/baseline/gp_samples.svg
deleted file mode 100644
index 60435a1e..00000000
--- a/GPy/testing/baseline/gp_samples.svg
+++ /dev/null
@@ -1,1081 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gplvm_gradient.png b/GPy/testing/baseline/gplvm_gradient.png
new file mode 100644
index 00000000..9f44577b
Binary files /dev/null and b/GPy/testing/baseline/gplvm_gradient.png differ
diff --git a/GPy/testing/baseline/gplvm_gradient.svg b/GPy/testing/baseline/gplvm_gradient.svg
deleted file mode 100644
index 2fc545aa..00000000
--- a/GPy/testing/baseline/gplvm_gradient.svg
+++ /dev/null
@@ -1,1649 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gplvm_latent.png b/GPy/testing/baseline/gplvm_latent.png
new file mode 100644
index 00000000..58e2c9d8
Binary files /dev/null and b/GPy/testing/baseline/gplvm_latent.png differ
diff --git a/GPy/testing/baseline/gplvm_latent.svg b/GPy/testing/baseline/gplvm_latent.svg
deleted file mode 100644
index a2b8d061..00000000
--- a/GPy/testing/baseline/gplvm_latent.svg
+++ /dev/null
@@ -1,1047 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gplvm_latent_3d.png b/GPy/testing/baseline/gplvm_latent_3d.png
new file mode 100644
index 00000000..f35b47c3
Binary files /dev/null and b/GPy/testing/baseline/gplvm_latent_3d.png differ
diff --git a/GPy/testing/baseline/gplvm_latent_3d.svg b/GPy/testing/baseline/gplvm_latent_3d.svg
deleted file mode 100644
index 899f56ff..00000000
--- a/GPy/testing/baseline/gplvm_latent_3d.svg
+++ /dev/null
@@ -1,1418 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/gplvm_magnification.png b/GPy/testing/baseline/gplvm_magnification.png
new file mode 100644
index 00000000..673c093a
Binary files /dev/null and b/GPy/testing/baseline/gplvm_magnification.png differ
diff --git a/GPy/testing/baseline/gplvm_magnification.svg b/GPy/testing/baseline/gplvm_magnification.svg
deleted file mode 100644
index 19157763..00000000
--- a/GPy/testing/baseline/gplvm_magnification.svg
+++ /dev/null
@@ -1,1047 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/kern_ARD.png b/GPy/testing/baseline/kern_ARD.png
new file mode 100644
index 00000000..ff7bc67a
Binary files /dev/null and b/GPy/testing/baseline/kern_ARD.png differ
diff --git a/GPy/testing/baseline/kern_ARD.svg b/GPy/testing/baseline/kern_ARD.svg
deleted file mode 100644
index 5d83d999..00000000
--- a/GPy/testing/baseline/kern_ARD.svg
+++ /dev/null
@@ -1,1150 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/kern_cov_1d.png b/GPy/testing/baseline/kern_cov_1d.png
new file mode 100644
index 00000000..06e9e4bc
Binary files /dev/null and b/GPy/testing/baseline/kern_cov_1d.png differ
diff --git a/GPy/testing/baseline/kern_cov_1d.svg b/GPy/testing/baseline/kern_cov_1d.svg
deleted file mode 100644
index df42759d..00000000
--- a/GPy/testing/baseline/kern_cov_1d.svg
+++ /dev/null
@@ -1,1018 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/kern_cov_2d.png b/GPy/testing/baseline/kern_cov_2d.png
new file mode 100644
index 00000000..4f94b6f4
Binary files /dev/null and b/GPy/testing/baseline/kern_cov_2d.png differ
diff --git a/GPy/testing/baseline/kern_cov_2d.svg b/GPy/testing/baseline/kern_cov_2d.svg
deleted file mode 100644
index 0ff2d966..00000000
--- a/GPy/testing/baseline/kern_cov_2d.svg
+++ /dev/null
@@ -1,1489 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/kern_cov_3d.png b/GPy/testing/baseline/kern_cov_3d.png
new file mode 100644
index 00000000..362f54bc
Binary files /dev/null and b/GPy/testing/baseline/kern_cov_3d.png differ
diff --git a/GPy/testing/baseline/kern_cov_3d.svg b/GPy/testing/baseline/kern_cov_3d.svg
deleted file mode 100644
index dfcaa52c..00000000
--- a/GPy/testing/baseline/kern_cov_3d.svg
+++ /dev/null
@@ -1,10230 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/kern_cov_no_lim.png b/GPy/testing/baseline/kern_cov_no_lim.png
new file mode 100644
index 00000000..a399ea37
Binary files /dev/null and b/GPy/testing/baseline/kern_cov_no_lim.png differ
diff --git a/GPy/testing/baseline/kern_cov_no_lim.svg b/GPy/testing/baseline/kern_cov_no_lim.svg
deleted file mode 100644
index e0045db1..00000000
--- a/GPy/testing/baseline/kern_cov_no_lim.svg
+++ /dev/null
@@ -1,1160 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/sparse_gp_class_likelihood.png b/GPy/testing/baseline/sparse_gp_class_likelihood.png
new file mode 100644
index 00000000..4f6c91e5
Binary files /dev/null and b/GPy/testing/baseline/sparse_gp_class_likelihood.png differ
diff --git a/GPy/testing/baseline/sparse_gp_class_likelihood.svg b/GPy/testing/baseline/sparse_gp_class_likelihood.svg
deleted file mode 100644
index 481a2893..00000000
--- a/GPy/testing/baseline/sparse_gp_class_likelihood.svg
+++ /dev/null
@@ -1,1476 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/sparse_gp_class_raw.png b/GPy/testing/baseline/sparse_gp_class_raw.png
new file mode 100644
index 00000000..250059fb
Binary files /dev/null and b/GPy/testing/baseline/sparse_gp_class_raw.png differ
diff --git a/GPy/testing/baseline/sparse_gp_class_raw.svg b/GPy/testing/baseline/sparse_gp_class_raw.svg
deleted file mode 100644
index 4e226d45..00000000
--- a/GPy/testing/baseline/sparse_gp_class_raw.svg
+++ /dev/null
@@ -1,1968 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/sparse_gp_class_raw_link.png b/GPy/testing/baseline/sparse_gp_class_raw_link.png
new file mode 100644
index 00000000..fb582a33
Binary files /dev/null and b/GPy/testing/baseline/sparse_gp_class_raw_link.png differ
diff --git a/GPy/testing/baseline/sparse_gp_class_raw_link.svg b/GPy/testing/baseline/sparse_gp_class_raw_link.svg
deleted file mode 100644
index 0d9cae98..00000000
--- a/GPy/testing/baseline/sparse_gp_class_raw_link.svg
+++ /dev/null
@@ -1,2162 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/baseline/sparse_gp_data_error.png b/GPy/testing/baseline/sparse_gp_data_error.png
new file mode 100644
index 00000000..9c4eeffa
Binary files /dev/null and b/GPy/testing/baseline/sparse_gp_data_error.png differ
diff --git a/GPy/testing/baseline/sparse_gp_data_error.svg b/GPy/testing/baseline/sparse_gp_data_error.svg
deleted file mode 100644
index b828aab6..00000000
--- a/GPy/testing/baseline/sparse_gp_data_error.svg
+++ /dev/null
@@ -1,562 +0,0 @@
-
-
-
-
diff --git a/GPy/testing/plotting_tests.py b/GPy/testing/plotting_tests.py
index 7d93dd08..5b3d47c0 100644
--- a/GPy/testing/plotting_tests.py
+++ b/GPy/testing/plotting_tests.py
@@ -72,7 +72,7 @@ try:
except ImportError:
raise SkipTest("Matplotlib not installed, not testing plots")
-extensions = ['svg']
+extensions = ['png']
def _image_directories():
"""