diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 41b385ce4a..9b0a0c5e2f 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -442,8 +442,22 @@ int main (int argc, char *argv[])
 	ui = 0;
 
 	ARDOUR::cleanup ();
+#ifndef NDEBUG
+	if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+		Glib::usleep(100000);
+		sched_yield();
+	}
+#endif
+
 	pthread_cancel_all ();
 
+#ifndef NDEBUG
+	if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+		Glib::usleep(100000);
+		sched_yield();
+	}
+#endif
+
 	console_madness_end ();
 
 	return 0;