Index: gnutls-3.5.11/tests/Makefile.am
===================================================================
--- gnutls-3.5.11.orig/tests/Makefile.am
+++ gnutls-3.5.11/tests/Makefile.am
@@ -19,7 +19,7 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-SUBDIRS = . cert-tests ocsp-tests key-tests slow dtls windows
+SUBDIRS = . cert-tests ocsp-tests key-tests slow windows
 
 if WANT_TEST_SUITE
 SUBDIRS += suite
@@ -91,7 +91,7 @@ ctests = mini-record-2 simple gc set_pkc
 	 crlverify mini-dtls-discard init_fds mini-record-failure \
 	 tls-rehandshake-cert-2 custom-urls set_x509_key_mem set_x509_key_file \
 	 mini-chain-unsorted x509-verify-with-crl mini-dtls-mtu privkey-verify-broken \
-	 mini-dtls-record-asym openpgp-callback key-import-export \
+	 mini-dtls-record-asym key-import-export \
 	 mini-dtls-fork mini-dtls-pthread mini-key-material x509cert-invalid \
 	 strict-der tls-ext-register tls-supplemental mini-dtls0-9 \
 	 mini-record-retvals mini-server-name tls-etm x509-cert-callback \
@@ -236,6 +236,7 @@ endif
 endif
 
 if ENABLE_OPENPGP
+SUBDIRS += dtls
 ctests += openpgp-auth openpgp-auth2 openpgp-keyring pgps2kgnu
 endif
 
@@ -244,7 +245,7 @@ ctests += x509self x509dn anonself pskse
 	setcredcrash resume-x509 resume-psk resume-anon
 
 if ENABLE_OPENPGP
-ctests += openpgpself 
+ctests += openpgpself openpgp-callback
 endif
 
 endif