diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index 0ebd2e2..468edd2 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -9,10 +9,6 @@
 	trau \
 	subscr \
 	mm_auth \
-	xid \
-	sndcp_xid \
-	slhc \
-	v42bis \
 	$(NULL)
 
 if BUILD_NAT
@@ -40,6 +36,10 @@
 SUBDIRS += \
 	sgsn \
 	oap \
+	xid \
+	sndcp_xid \
+	slhc \
+	v42bis \
 	$(NULL)
 endif
 endif
diff --git a/openbsc/tests/testsuite.at b/openbsc/tests/testsuite.at
index f18b734..4905cd1 100644
--- a/openbsc/tests/testsuite.at
+++ b/openbsc/tests/testsuite.at
@@ -126,24 +126,28 @@
 
 AT_SETUP([xid])
 AT_KEYWORDS([xid])
+AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
 cat $abs_srcdir/xid/xid_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/xid/xid_test], [], [expout], [ignore])
 AT_CLEANUP
 
 AT_SETUP([sndcp_xid])
 AT_KEYWORDS([sndcp_xid])
+AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
 cat $abs_srcdir/sndcp_xid/sndcp_xid_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/sndcp_xid/sndcp_xid_test], [], [expout], [ignore])
 AT_CLEANUP
 
 AT_SETUP([slhc])
 AT_KEYWORDS([slhc])
+AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
 cat $abs_srcdir/slhc/slhc_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/slhc/slhc_test], [], [expout], [ignore])
 AT_CLEANUP
 
 AT_SETUP([v42bis])
 AT_KEYWORDS([v42bis])
+AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
 cat $abs_srcdir/v42bis/v42bis_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/v42bis/v42bis_test], [], [expout], [ignore])
 AT_CLEANUP