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