diff --git a/doc/alignment_demo.py b/doc/alignment_demo.py
index 57e65e7..74fce04 100755
--- a/doc/alignment_demo.py
+++ b/doc/alignment_demo.py
@@ -80,5 +80,4 @@
 fig.axes.append(ax)
 plt.title('only scaled')
 
-fig.tight_layout()
 plt.show()
diff --git a/evo/tools/plot.py b/evo/tools/plot.py
index dce74c2..4390bc3 100644
--- a/evo/tools/plot.py
+++ b/evo/tools/plot.py
@@ -74,6 +74,9 @@ def apply_settings(settings: SettingsContainer = SETTINGS):
         "legend.loc": settings.plot_legend_loc,
         "lines.linewidth": settings.plot_linewidth,
         "text.usetex": settings.plot_usetex,
+        # NOTE: don't call tight_layout manually anymore. See warning here:
+        # https://matplotlib.org/stable/users/explain/axes/constrainedlayout_guide.html
+        "figure.constrained_layout.use": True,
         "font.family": settings.plot_fontfamily,
         "pgf.texsystem": settings.plot_texsystem
     })
@@ -123,7 +126,6 @@ def __str__(self) -> str:
         return self.title + " (" + str(len(self.figures)) + " figure(s))"
 
     def add_figure(self, name: str, fig: Figure) -> None:
-        fig.tight_layout()
         self.figures[name] = fig
 
     @staticmethod
@@ -179,7 +181,6 @@ def tabbed_tk_window(self) -> None:
         nb = ttk.Notebook(self.root_window)
         nb.grid(row=1, column=0, sticky='NESW')
         for name, fig in self.figures.items():
-            fig.tight_layout()
             tab = ttk.Frame(nb)
             canvas = FigureCanvasTkAgg(self.figures[name], master=tab)
             canvas.draw()
@@ -231,7 +232,6 @@ def export(self, file_path: str, confirm_overwrite: bool = True) -> None:
             import matplotlib.backends.backend_pdf
             pdf = matplotlib.backends.backend_pdf.PdfPages(file_path)
             for name, fig in self.figures.items():
-                # fig.tight_layout()  # TODO
                 pdf.savefig(fig)
             pdf.close()
             logger.info("Plots saved to " + file_path)
@@ -241,7 +241,6 @@ def export(self, file_path: str, confirm_overwrite: bool = True) -> None:
                 if confirm_overwrite and not user.check_and_confirm_overwrite(
                         dest):
                     return
-                fig.tight_layout()
                 fig.savefig(dest)
                 logger.info("Plot saved to " + dest)
 
diff --git a/pyproject.toml b/pyproject.toml
index 2834309..45bbbe1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,7 @@ requires-python = ">=3.8"
 
 dependencies = [
     "numpy>=1.18.5",
-    "matplotlib",
+    "matplotlib>=3.6.0",
     "scipy>=1.2",
     "pandas",
     "numexpr>=2.7.3",