diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index a30c796..05b06e4 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -963,11 +963,3 @@
 	test_setup_rewrite();
 	return 0;
 }
-
-void input_event()
-{}
-int nm_state_event()
-{
-	return -1;
-}
-
diff --git a/openbsc/tests/channel/Makefile.am b/openbsc/tests/channel/Makefile.am
index 7729659..8593b5a 100644
--- a/openbsc/tests/channel/Makefile.am
+++ b/openbsc/tests/channel/Makefile.am
@@ -9,6 +9,7 @@
 	$(top_srcdir)/src/gsm_subscriber.c \
 	$(top_srcdir)/src/debug.c \
 	$(top_srcdir)/src/gsm_data.c \
+	$(top_srcdir)/src/abis_nm.c \
 	$(top_srcdir)/src/bts_ipaccess_nanobts.c \
 	$(top_srcdir)/src/bts_siemens_bs11.c
 channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS)
diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c
index 8403997..4f3c593 100644
--- a/openbsc/tests/channel/channel_test.c
+++ b/openbsc/tests/channel/channel_test.c
@@ -72,8 +72,7 @@
 	}
 }
 
-void nm_state_event() {}
-void input_event() {}
+void _abis_nm_sendmsg() {}
 void sms_alloc() {}
 void gsm_net_update_ctype(struct gsm_network *network) {}
 void gsm48_secure_channel() {}
diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c
index eba72df..236dc37 100644
--- a/openbsc/tests/db/db_test.c
+++ b/openbsc/tests/db/db_test.c
@@ -102,6 +102,4 @@
 }
 
 /* stubs */
-void input_event(void) {}
-void nm_state_event(void) {}
 void vty_out() {}
diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c
index 6c99290..e8998c3 100644
--- a/openbsc/tests/gsm0408/gsm0408_test.c
+++ b/openbsc/tests/gsm0408/gsm0408_test.c
@@ -101,11 +101,3 @@
 
 	exit(0);
 }
-
-
-
-/*
- * Stubs to compile and link
- */
-void input_event(void) {}
-void nm_state_event(void) {}