diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..e3ef4b7d
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,6 @@
+[pytest]
+filterwarnings =
+    error
+
+    # Coming from vispy
+    ignore:distutils Version classes are deprecated:DeprecationWarning
diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py
index b4d8c7cf..c580361d 100644
--- a/src/napari_matplotlib/base.py
+++ b/src/napari_matplotlib/base.py
@@ -57,7 +57,7 @@ def __init__(self, napari_viewer: napari.viewer.Viewer):
 
         self.viewer = napari_viewer
         self.canvas = FigureCanvas()
-        self.canvas.figure.set_tight_layout(True)
+        self.canvas.figure.set_layout_engine("constrained")
         self.canvas.figure.patch.set_facecolor("#262930")
         self.toolbar = NapariNavigationToolbar(self.canvas, self)
         self._replace_toolbar_icons()