diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index ea05d45..313d9a3 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -308,12 +308,12 @@
 
 int gsm48_generate_mid_from_tmsi(uint8_t *buf, uint32_t tmsi)
 {
-	uint32_t *tptr = (uint32_t *) &buf[3];
+	uint32_t tmsi_be = htonl(tmsi);
 
 	buf[0] = GSM48_IE_MOBILE_ID;
 	buf[1] = GSM48_TMSI_LEN;
 	buf[2] = 0xf0 | GSM_MI_TYPE_TMSI;
-	*tptr = htonl(tmsi);
+	memcpy(&buf[3], &tmsi_be, sizeof(tmsi_be));
 
 	return 7;
 }
diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index 077063b..b469b30 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -20,10 +20,13 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/gsm/gsm48_ie.h>
+#include <osmocom/gsm/gsm48.h>
 #include <osmocom/gsm/mncc.h>
+#include <osmocom/core/backtrace.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/msgb.h>
 
@@ -127,7 +130,27 @@
 	return 0;
 }
 
+static void test_mid_from_tmsi(void)
+{
+	static const uint8_t res[] = { 0x17, 0x05, 0xf4, 0xaa, 0xbb, 0xcc, 0xdd };
+
+
+	uint32_t tmsi = 0xAABBCCDD;
+	uint8_t buf[3 + sizeof(uint32_t)];
+
+	printf("Simple TMSI encoding test....");
+
+	memset(&buf, 0xFE, sizeof(buf));
+	gsm48_generate_mid_from_tmsi(buf, tmsi);
+
+	OSMO_ASSERT(memcmp(buf, res, sizeof(res)) == 0);
+	printf("passed\n");
+}
+
 int main(int argc, char **argv)
 {
 	test_bearer_cap();
+	test_mid_from_tmsi();
+
+	return EXIT_SUCCESS;
 }
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index 5ce19e6..4a6d78b 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -1,2 +1,3 @@
 Test `CSD 9600/V.110/transparent' passed
 Test `Speech, all codecs' passed
+Simple TMSI encoding test....passed