4 files changed, 8 insertions, 9 deletions
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
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
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
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;