diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c
index 9672dcb..e8a4ef9 100644
--- a/tests/gbproxy/gbproxy_test.c
+++ b/tests/gbproxy/gbproxy_test.c
@@ -31,11 +31,11 @@
 #include <osmocom/gprs/gprs_ns.h>
 #include <osmocom/gprs/gprs_bssgp.h>
 
-#include <openbsc/gb_proxy.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_gb_parse.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gb_proxy.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <openssl/rand.h>
 
diff --git a/tests/gprs/gprs_test.c b/tests/gprs/gprs_test.c
index aac9bb8..2dcbafa 100644
--- a/tests/gprs/gprs_test.c
+++ b/tests/gprs/gprs_test.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_utils.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_utils.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/application.h>
 #include <osmocom/gsm/gsup.h>
diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c
index e7c27d2..ac0223b 100644
--- a/tests/gtphub/gtphub_test.c
+++ b/tests/gtphub/gtphub_test.c
@@ -28,9 +28,9 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/application.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
-#include <openbsc/gtphub.h>
+#include <osmocom/sgsn/gtphub.h>
 #include <gtp.h>
 #include <gtpie.h>
 
diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c
index e6501cb..7adae83 100644
--- a/tests/oap/oap_client_test.c
+++ b/tests/oap/oap_client_test.c
@@ -21,8 +21,8 @@
 #include <osmocom/core/application.h>
 #include <osmocom/gsm/oap.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/oap_client.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/oap_client.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c
index d66c5dd..a486794 100644
--- a/tests/sgsn/sgsn_test.c
+++ b/tests/sgsn/sgsn_test.c
@@ -19,15 +19,15 @@
  *
  */
 
-#include <openbsc/gprs_llc.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/debug.h>
-#include <openbsc/gprs_subscriber.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_subscriber.h>
 #include <osmocom/gsm/gsup.h>
-#include <openbsc/gsup_client.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/gprs_gb_parse.h>
+#include <osmocom/sgsn/gsup_client.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
 
 #include <osmocom/gprs/gprs_bssgp.h>
 
diff --git a/tests/slhc/slhc_test.c b/tests/slhc/slhc_test.c
index d2e1cd9..bb0e26c 100644
--- a/tests/slhc/slhc_test.c
+++ b/tests/slhc/slhc_test.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/slhc.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/slhc.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
diff --git a/tests/sndcp_xid/sndcp_xid_test.c b/tests/sndcp_xid/sndcp_xid_test.c
index 151dd2b..dc6da82 100644
--- a/tests/sndcp_xid/sndcp_xid_test.c
+++ b/tests/sndcp_xid/sndcp_xid_test.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/gprs_sndcp_xid.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
diff --git a/tests/v42bis/v42bis_test.c b/tests/v42bis/v42bis_test.c
index 7e90785..41d23b0 100644
--- a/tests/v42bis/v42bis_test.c
+++ b/tests/v42bis/v42bis_test.c
@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/v42bis.h>
-#include <openbsc/v42bis_private.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/v42bis.h>
+#include <osmocom/sgsn/v42bis_private.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
diff --git a/tests/xid/xid_test.c b/tests/xid/xid_test.c
index b77a4ae..e30a14f 100644
--- a/tests/xid/xid_test.c
+++ b/tests/xid/xid_test.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/gprs_llc_xid.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gprs_llc_xid.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>