diff --git a/tests/tools/test_plotting.py b/tests/tools/test_plotting.py
index 8a1567f..6b5b751 100644
--- a/tests/tools/test_plotting.py
+++ b/tests/tools/test_plotting.py
@@ -11,21 +11,16 @@ def test_plot_amplitude(show_plot):
     # Test with tensor
     im = t.as_tensor(scipy.datasets.ascent(), dtype=t.complex128)
     plotting.plot_amplitude(im, basis=np.array([[0, -1], [-1, 0], [0, 0]]), title='Test Amplitude')
-    if show_plot:
-        plt.show()
-    plt.close('all')
     
     # Test with numpy array and an extra dimension
     im = np.stack([scipy.datasets.ascent().astype(np.complex128)]*3, axis=0)
     plotting.plot_amplitude(im, title='Test Amplitude')
-    if show_plot:
-        plt.show()
-    plt.close('all')
     
     # Test with pytorch tensor and two extra dimensions
     im = t.as_tensor(np.stack([im]*5, axis=0))
     plotting.plot_amplitude(im, title='Test Amplitude',
                             additional_axis_labels=['Hi','There'])
+    
     if show_plot:
         plt.show()
     plt.close('all')
@@ -34,13 +29,11 @@ def test_plot_phase(show_plot):
     # Test with tensor
     im = initializers.gaussian([512, 512], [200, 200], amplitude=100, curvature=[.1, .1])
     plotting.plot_phase(im, title='Test Phase')
-    if show_plot:
-        plt.show()
-    plt.close('all')
     
     # Test with numpy array
     im = initializers.gaussian([512, 512], [200, 200], amplitude=100, curvature=[.1, .1]).numpy()
     plotting.plot_phase(im, title='Test Phase', basis=np.array([[0, -1], [-1, 0], [0, 0]]))
+    
     if show_plot:
         plt.show()
     plt.close('all')
@@ -51,13 +44,11 @@ def test_plot_colorized(show_plot):
     gaussian = initializers.gaussian([512, 512], [200, 200], amplitude=100, curvature=[.1, .1])
     im = gaussian * t.as_tensor(scipy.datasets.ascent(), dtype=t.complex64)
     plotting.plot_colorized(im, title='Test Colorize', basis=np.array([[0, -1], [-1, 0], [0, 0]]))
-    if show_plot:
-        plt.show()
-    plt.close('all')
 
     # Test with numpy array and hsv
     im = im.numpy()
     plotting.plot_colorized(im, title='Test Colorize', use_cmocean=False)
+    
     if show_plot:
         plt.show()
     plt.close('all')
@@ -70,13 +61,11 @@ def test_plot_translations(show_plot):
 
     # numpy, defaults
     plotting.plot_translations(trans_np)
-    if show_plot:
-        plt.show()
-    plt.close('all')
 
     # torch tensor and reuse figure
     fig = plotting.plot_translations(trans_t)
     plotting.plot_translations(trans_np, lines=False, color='red', label='scan', fig=fig, clear_fig=False)
+    
     if show_plot:
         plt.show()
     plt.close('all')
@@ -90,12 +79,10 @@ def test_plot_nanomap(show_plot):
 
     # numpy, defaults
     plotting.plot_nanomap(trans_np, values_np)
-    if show_plot:
-        plt.show()
-    plt.close('all')
 
     # torch tensors
     plotting.plot_nanomap(trans_t, values_t, units='nm', cmap_label='Intensity', convention='sample')
+    
     if show_plot:
         plt.show()
     plt.close('all')
@@ -117,19 +104,14 @@ def test_plot_nanomap_with_images(show_plot):
 
     # basic call, no values
     plotting.plot_nanomap_with_images(trans_np, get_image_2d)
-    if show_plot:
-        plt.show()
-    plt.close('all')
 
     # with explicit values
     plotting.plot_nanomap_with_images(trans_t, get_image_2d, values=values_np)
-    if show_plot:
-        plt.show()
-    plt.close('all')
 
     # 3D image stack
     fig = plt.figure(figsize=(11,7))
     plotting.plot_nanomap_with_images(trans_np, get_image_3d, values=values_t, fig=fig)
+    
     if show_plot:
         plt.show()
     plt.close('all')