diff --git a/tests/ChangeLog b/tests/ChangeLog
index ab9a60aa..9e68d51d 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,16 @@
+2009-07-07  Werner Koch  <wk@g10code.com>
+
+	* gpg/pgp-keylist.c: Rename to ...
+	* run-keylist.c: ... this.
+	* gpg/pgp-import.c: Rename to ...
+	* run-import.c: ... this.
+	* gpg/pgp-export.c: Rename to ...
+	* run-export.c: ... this.
+	* run-support.h: New. Copied from gpg/t-support.h.
+	* gpg/Makefile.am (noinst_PROGRAMS): Remove them.
+	* Makefile.am (noinst_PROGRAMS): Add them.
+	(noinst_HEADERS): New.
+
 2009-06-22  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpg/t-support.h (passphrase_cb): Implement write() according to
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc2b0370..81d7e548 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,10 @@ INCLUDES = -I$(top_builddir)/src
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
 LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
 
-noinst_PROGRAMS = $(TESTS)
+noinst_HEADERS = run-support.h
+
+noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import
+
 
 if RUN_GPG_TESTS
 gpgtests = gpg
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 441e80ca..5da0bbbf 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -50,8 +50,7 @@ LDADD = ../../src/libgpgme.la
 t_thread1_LDADD = ../../src/libgpgme-pthread.la
 
 # We don't run t-genkey in the test suite, because it takes too long
-# The other programs are used for debugging.
-noinst_PROGRAMS = $(TESTS) t-genkey pgp-keylist pgp-export pgp-import
+noinst_PROGRAMS = $(TESTS) t-genkey
 
 mkdemodirs: mkdemodirs.in Makefile
 	sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs
diff --git a/tests/gpg/pgp-export.c b/tests/run-export.c
similarity index 98%
rename from tests/gpg/pgp-export.c
rename to tests/run-export.c
index a0b3e8a5..8dddb5bc 100644
--- a/tests/gpg/pgp-export.c
+++ b/tests/run-export.c
@@ -29,9 +29,9 @@
 
 #include <gpgme.h>
 
-#define PGM "pgp-export"
+#define PGM "run-export"
 
-#include "t-support.h"
+#include "run-support.h"
 
 
 static int verbose;
diff --git a/tests/gpg/pgp-import.c b/tests/run-import.c
similarity index 98%
rename from tests/gpg/pgp-import.c
rename to tests/run-import.c
index b9d68608..cd101b01 100644
--- a/tests/gpg/pgp-import.c
+++ b/tests/run-import.c
@@ -29,9 +29,9 @@
 
 #include <gpgme.h>
 
-#define PGM "pgp-import"
+#define PGM "run-import"
 
-#include "t-support.h"
+#include "run-support.h"
 
 
 static int verbose;
diff --git a/tests/gpg/pgp-keylist.c b/tests/run-keylist.c
similarity index 98%
rename from tests/gpg/pgp-keylist.c
rename to tests/run-keylist.c
index 4978b8dd..07fc8941 100644
--- a/tests/gpg/pgp-keylist.c
+++ b/tests/run-keylist.c
@@ -1,4 +1,4 @@
-/* pgp-keylist.c  - Helper to show a key listing.
+/* run-keylist.c  - Helper to show a key listing.
    Copyright (C) 2008, 2009 g10 Code GmbH
 
    This file is part of GPGME.
@@ -29,9 +29,9 @@
 
 #include <gpgme.h>
 
-#define PGM "pgp-keylist"
+#define PGM "run-keylist"
 
-#include "t-support.h"
+#include "run-support.h"
 
 
 static int verbose;