diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 28dba2f544..e587de8145 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -569,6 +569,15 @@ ARDOUR_UI::~ARDOUR_UI ()
 	}
 
 	stop_video_server();
+
+	if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+		// don't bother at 'real' exit. the OS cleans up for us.
+		delete big_clock;
+		delete primary_clock;
+		delete secondary_clock;
+		delete _process_thread;
+		delete gui_object_state;
+	}
 }
 
 void
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index e596c67634..1baee22e11 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -184,6 +184,14 @@ PluginManager::PluginManager ()
 
 PluginManager::~PluginManager()
 {
+	if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+		// don't bother, just exit quickly.
+		delete _windows_vst_plugin_info;
+		delete _lxvst_plugin_info;
+		delete _ladspa_plugin_info;
+		delete _lv2_plugin_info;
+		delete _au_plugin_info;
+	}
 }
 
 void