diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index 5212c67..5e115eb 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -11,9 +11,8 @@
 bin_PROGRAMS = osmo-gbproxy
 
 if HAVE_LIBGTP
-bin_PROGRAMS += osmo-gtphub
 if HAVE_LIBCARES
-bin_PROGRAMS += osmo-sgsn
+bin_PROGRAMS += osmo-sgsn osmo-gtphub
 endif
 endif
 
diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index 995660a..04b8e34 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -13,7 +13,10 @@
 endif
 
 if HAVE_LIBGTP
-SUBDIRS += sgsn oap gtphub
+SUBDIRS += gtphub
+if HAVE_LIBCARES
+SUBDIRS += sgsn oap
+endif
 endif