diff --git a/ChangeLog b/ChangeLog
index 6f16f7473b585a2c587ab9f164e2a63cff304dee..cdac8ae7e972237831703fb8aa9e4a80b0d2b44f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-16  Niels Möller  <nisse@lysator.liu.se>
 
+	* run-tests (test_program): Don't quote $EMULATOR; allow it to
+	expand to program and arguments (e.g., valgrind).
+
 	* tools/pkcs1-conv.c (convert_public_key): Added missing calls to
 	dsa_public_key_clear and rsa_public_key_clear.
 	(main): Added missing nettle_buffer_clear.
diff --git a/run-tests b/run-tests
index 560cc4e0fcaac20af4e81936c0848a167dcf152b..e77e6a638fab691d84e2ebabb935e2824ad4c563 100755
--- a/run-tests
+++ b/run-tests
@@ -44,7 +44,7 @@ test_program () {
   if [ -z "$EMULATOR" ] || head -1 "$1" | grep '^#!' > /dev/null; then
     "$1" $testflags
   else
-    "$EMULATOR" "$1" $testflags
+    $EMULATOR "$1" $testflags
   fi
   case "$?" in
       0)