diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test
index c09e8a96b98..2dca848b4a1 100755
--- a/src/glsl/glcpp/tests/glcpp-test
+++ b/src/glsl/glcpp/tests/glcpp-test
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+trap 'rm $test.valgrind-errors; exit 1' INT QUIT
+
 total=0
 pass=0
 clean=0