diff --git a/.gitignore b/.gitignore
index f1ea9863..f1413402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.*.swp
 .tox
 .cache
 *.py[cod]
diff --git a/pytest_mpl/plugin.py b/pytest_mpl/plugin.py
index 53414cd6..1fe9ae1d 100644
--- a/pytest_mpl/plugin.py
+++ b/pytest_mpl/plugin.py
@@ -177,10 +177,10 @@ def pytest_runtest_setup(self, item):
         import matplotlib
         import matplotlib.pyplot as plt
         from matplotlib.testing.compare import compare_images
-        from matplotlib.testing.decorators import ImageComparisonTest as MplImageComparisonTest
         try:
             from matplotlib.testing.decorators import remove_ticks_and_titles
         except ImportError:
+            from matplotlib.testing.decorators import ImageComparisonTest as MplImageComparisonTest
             remove_ticks_and_titles = MplImageComparisonTest.remove_text
 
         MPL_LT_15 = LooseVersion(matplotlib.__version__) < LooseVersion('1.5')