diff --git a/.gitignore b/.gitignore
index 9634a3939793..ee4a0eb7aef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ examples/*/*.svgz
 examples/tests/*
 !examples/tests/backend_driver_sgskip.py
 result_images
+doc/_static/constrained_layout*.png
 
 # Nose/Pytest generated files #
 ###############################
diff --git a/doc/_static/constrained_layout/CL00.png b/doc/_static/constrained_layout/CL00.png
deleted file mode 100644
index 5963429df0f8..000000000000
Binary files a/doc/_static/constrained_layout/CL00.png and /dev/null differ
diff --git a/doc/_static/constrained_layout/CL01.png b/doc/_static/constrained_layout/CL01.png
deleted file mode 100644
index 5b08c6be2425..000000000000
Binary files a/doc/_static/constrained_layout/CL01.png and /dev/null differ
diff --git a/doc/_static/constrained_layout/CL02.png b/doc/_static/constrained_layout/CL02.png
deleted file mode 100644
index bba3cf15b891..000000000000
Binary files a/doc/_static/constrained_layout/CL02.png and /dev/null differ
diff --git a/tutorials/intermediate/constrainedlayout_guide.py b/tutorials/intermediate/constrainedlayout_guide.py
index 1975153db181..2722f71957ac 100644
--- a/tutorials/intermediate/constrainedlayout_guide.py
+++ b/tutorials/intermediate/constrainedlayout_guide.py
@@ -229,12 +229,13 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 leg.set_in_layout(True)
 # we don't want the layout to change at this point.
 fig.set_constrained_layout(False)
-fig.savefig('CL01.png', bbox_inches='tight', dpi=100)
+fig.savefig('../../doc/_static/constrained_layout_1b.png',
+            bbox_inches='tight', dpi=100)
 
 #############################################
 # The saved file looks like:
 #
-# .. image:: /_static/constrained_layout/CL01.png
+# .. image:: /_static/constrained_layout_1b.png
 #    :align: center
 #
 # A better way to get around this awkwardness is to simply
@@ -245,12 +246,13 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 labels = [l.get_label() for l in lines]
 leg = fig.legend(lines, labels, loc='center left',
                  bbox_to_anchor=(0.8, 0.5), bbox_transform=axs[1].transAxes)
-fig.savefig('CL02.png', bbox_inches='tight', dpi=100)
+fig.savefig('../../doc/_static/constrained_layout_2b.png',
+            bbox_inches='tight', dpi=100)
 
 #############################################
 # The saved file looks like:
 #
-# .. image:: /_static/constrained_layout/CL02.png
+# .. image:: /_static/constrained_layout_2b.png
 #    :align: center
 #