diff --git a/tests/ChangeLog b/tests/ChangeLog
index 94aa5760..add52e71 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-10  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpg/t-gpgconf.c (main): Exit early if compiled without gpgconf.
+
 2008-01-04  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpg/Makefile.am (CLEANFILES): Add pubring.kbx and dirmngr.conf.
diff --git a/tests/gpg/t-gpgconf.c b/tests/gpg/t-gpgconf.c
index 458bbe75..a619a465 100644
--- a/tests/gpg/t-gpgconf.c
+++ b/tests/gpg/t-gpgconf.c
@@ -254,6 +254,11 @@ main (int argc, char **argv)
   gpgme_conf_comp_t conf;
   gpgme_conf_comp_t comp;
   int first;
+
+#ifndef ENABLE_GPGCONF
+  return 0;
+#endif
+
   init_gpgme (GPGME_PROTOCOL_GPGCONF);
 
   err = gpgme_new (&ctx);