diff --git a/tests/db/db_test.c b/tests/db/db_test.c
index a0c1e79..63099f6 100644
--- a/tests/db/db_test.c
+++ b/tests/db/db_test.c
@@ -18,11 +18,11 @@
  *
  */
 
-#include <openbsc/debug.h>
-#include <openbsc/db.h>
-#include <openbsc/gsm_subscriber.h>
-#include <openbsc/gsm_04_11.h>
-#include <openbsc/mgcp.h>
+#include <osmocom/msc/debug.h>
+#include <osmocom/msc/db.h>
+#include <osmocom/msc/gsm_subscriber.h>
+#include <osmocom/msc/gsm_04_11.h>
+#include <osmocom/msc/mgcp.h>
 
 #include <osmocom/core/application.h>
 
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 4b10e49..d05aa29 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -30,15 +30,15 @@
 #include <osmocom/core/application.h>
 #include <osmocom/gsm/protocol/gsm_04_11.h>
 #include <osmocom/gsm/gsup.h>
-#include <openbsc/gsup_client.h>
-#include <openbsc/gsm_04_11.h>
-#include <openbsc/debug.h>
+#include <osmocom/msc/gsup_client.h>
+#include <osmocom/msc/gsm_04_11.h>
+#include <osmocom/msc/debug.h>
 
 #if BUILD_IU
-#include <openbsc/iucs_ranap.h>
+#include <osmocom/msc/iucs_ranap.h>
 #include <osmocom/ranap/iu_client.h>
 #else
-#include <openbsc/iu_dummy.h>
+#include <osmocom/msc/iu_dummy.h>
 #endif
 
 #include "msc_vlr_tests.h"
diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h
index c2c5a58..1cd3914 100644
--- a/tests/msc_vlr/msc_vlr_tests.h
+++ b/tests/msc_vlr/msc_vlr_tests.h
@@ -26,9 +26,9 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/osmo_msc.h>
-#include <openbsc/vlr.h>
+#include <osmocom/msc/gsm_data.h>
+#include <osmocom/msc/osmo_msc.h>
+#include <osmocom/msc/vlr.h>
 
 extern bool _log_lines;
 #define _log(fmt, args...) do { \
diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c
index 62fa9d2..5f5f2d6 100644
--- a/tests/smpp/smpp_test.c
+++ b/tests/smpp/smpp_test.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/msc/debug.h>
 
 #include <osmocom/core/application.h>
 #include <osmocom/core/backtrace.h>
diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c
index af25b06..0d073db 100644
--- a/tests/sms_queue/sms_queue_test.c
+++ b/tests/sms_queue/sms_queue_test.c
@@ -23,8 +23,8 @@
 
 #include <osmocom/core/application.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/vlr.h>
+#include <osmocom/msc/debug.h>
+#include <osmocom/msc/vlr.h>
 
 static void *talloc_ctx = NULL;