diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index df6ca6793..0d6a1da95 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -84,6 +84,12 @@ PKG_CHECK_MODULES([LIBCARES], [libcares], [], [found_libcares=no])
 AM_CONDITIONAL(HAVE_LIBCARES, test "$found_libcares" = yes)
 AC_SUBST(found_libcares)
 
+found_libgtp_and_libcares=no
+if test "$found_libgtp" = "yes" -a "$found_libcares" = "yes"; then
+    found_libgtp_and_libcares=yes
+fi
+AC_SUBST(found_libgtp_and_libcares)
+
 dnl checks for header files
 AC_HEADER_STDC
 AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
diff --git a/openbsc/tests/atlocal.in b/openbsc/tests/atlocal.in
index 7475f638f..362bfa9df 100644
--- a/openbsc/tests/atlocal.in
+++ b/openbsc/tests/atlocal.in
@@ -2,5 +2,6 @@ enable_nat_test='@osmo_ac_build_nat@'
 enable_smpp_test='@osmo_ac_build_smpp@'
 enable_bsc_test='@osmo_ac_build_bsc@'
 enable_mgcp_transcoding_test='@osmo_ac_mgcp_transcoding@'
-enable_sgsn_test='@found_libgtp@'
-enable_gtphub_test='@found_libgtp@'
+enable_sgsn_test='@found_libgtp_and_libcares@'
+enable_oap_test='@found_libgtp_and_libcares@'
+enable_gtphub_test='@found_libgtp_and_libcares@'