diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am
index f9a922465..0e150367c 100644
--- a/tests/msc_vlr/Makefile.am
+++ b/tests/msc_vlr/Makefile.am
@@ -13,6 +13,7 @@ AM_CFLAGS = \
 	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(LIBOSMORANAP_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
 	$(LIBASN1C_CFLAGS) \
 	$(LIBOSMOMGCPCLIENT_CFLAGS) \
 	$(LIBOSMOGSUPCLIENT_CFLAGS) \
@@ -46,7 +47,6 @@ LDADD = \
 
 noinst_HEADERS = \
 	msc_vlr_tests.h \
-	stubs.h \
 	$(NULL)
 
 EXTRA_DIST = \
@@ -94,61 +94,73 @@ noinst_PROGRAMS = \
 msc_vlr_test_no_authen_SOURCES = \
 	msc_vlr_test_no_authen.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_gsm_authen_SOURCES = \
 	msc_vlr_test_gsm_authen.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_gsm_ciph_SOURCES = \
 	msc_vlr_test_gsm_ciph.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_umts_authen_SOURCES = \
 	msc_vlr_test_umts_authen.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_authen_reuse_SOURCES = \
 	msc_vlr_test_authen_reuse.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_hlr_reject_SOURCES = \
 	msc_vlr_test_hlr_reject.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_hlr_timeout_SOURCES = \
 	msc_vlr_test_hlr_timeout.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_ms_timeout_SOURCES = \
 	msc_vlr_test_ms_timeout.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_reject_concurrency_SOURCES = \
 	msc_vlr_test_reject_concurrency.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_call_SOURCES = \
 	msc_vlr_test_call.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_rest_SOURCES = \
 	msc_vlr_test_rest.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 msc_vlr_test_ss_SOURCES = \
 	msc_vlr_test_ss.c \
 	msc_vlr_tests.c \
+	$(srcdir)/../stubs.c \
 	$(NULL)
 
 .PHONY: update_exp
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
index 9eadec7f9..d73a5f8c5 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
@@ -24,7 +24,6 @@
 /* NOTE that further auth re-use tests exist in msc_vlr_test_hlr_reject.c */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static void _test_auth_reuse(enum osmo_rat_type via_ran,
 			     int set_max_reuse_count,
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index b31239e48..6805f1a23 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 #include <osmocom/msc/gsm_04_08.h>
 
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 805ae6425..8776e03ab 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static void test_gsm_authen()
 {
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index ceb17a5fe..c76cba4ef 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static const struct osmo_gsm48_classmark classmark = {
 	// TODO
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
index 1134d8971..45aaa8ca5 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static void test_hlr_rej_auth_info_unknown_imsi()
 {
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
index af5441b7c..abc7c5b06 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 #include <osmocom/core/logging.h>
 
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
index 450909fe9..91f00ef71 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static void test_ms_timeout_lu_auth_resp()
 {
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c
index b3289f3eb..ae77252e1 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static void test_no_authen()
 {
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
index 7eaedb27c..fe5346945 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static void test_reject_2nd_conn()
 {
diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c
index 620652c95..1b998adfb 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.c
+++ b/tests/msc_vlr/msc_vlr_test_rest.c
@@ -22,7 +22,7 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
+
 #include <osmocom/msc/vlr.h>
 
 #if 0
diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c
index e4b3a4e4d..978ceae17 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.c
+++ b/tests/msc_vlr/msc_vlr_test_ss.c
@@ -21,7 +21,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 #define IMSI "901700000004620"
 
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c
index cb8a03291..a89b0d1ab 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c
@@ -22,7 +22,6 @@
  */
 
 #include "msc_vlr_tests.h"
-#include "stubs.h"
 
 static void _test_umts_authen(enum osmo_rat_type via_ran)
 {
diff --git a/tests/msc_vlr/stubs.h b/tests/stubs.c
similarity index 97%
rename from tests/msc_vlr/stubs.h
rename to tests/stubs.c
index bf55baafb..d011a312a 100644
--- a/tests/msc_vlr/stubs.h
+++ b/tests/stubs.c
@@ -18,6 +18,9 @@
  *
  */
 
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/netif/stream.h>
+
 void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {}
 struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; }
 void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {}