diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
index 5753b41c459c..eb60a0d918bd 100644
--- a/lib/matplotlib/tests/test_quiver.py
+++ b/lib/matplotlib/tests/test_quiver.py
@@ -162,6 +162,7 @@ def test_bad_masked_sizes():
     ax.barbs(x, y, u, v)
 
 
+@cleanup
 def test_quiverkey_angles():
     # Check that only a single arrow is plotted for a quiverkey when an array
     # of angles is given to the original quiver plot
diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
index e5936702773a..fc840ba5c429 100644
--- a/lib/matplotlib/tests/test_scale.py
+++ b/lib/matplotlib/tests/test_scale.py
@@ -8,7 +8,7 @@
 
 @image_comparison(baseline_images=['log_scales'], remove_text=True)
 def test_log_scales():
-    ax = plt.subplot(122, yscale='log', xscale='symlog')
+    ax = plt.figure().add_subplot(122, yscale='log', xscale='symlog')
 
     ax.axvline(24.1)
     ax.axhline(24.1)
@@ -17,7 +17,7 @@ def test_log_scales():
 @image_comparison(baseline_images=['logit_scales'], remove_text=True,
                   extensions=['png'])
 def test_logit_scales():
-    ax = plt.subplot(111, xscale='logit')
+    ax = plt.figure().add_subplot(111, xscale='logit')
 
     # Typical extinction curve for logit
     x = np.array([0.001, 0.003, 0.01, 0.03, 0.1, 0.2, 0.3, 0.4, 0.5,