diff --git a/tests/msgb/msgb_test.c b/tests/msgb/msgb_test.c
new file mode 100644
index 0000000..7592509
--- /dev/null
+++ b/tests/msgb/msgb_test.c
@@ -0,0 +1,104 @@
+/*
+ * (C) 2014 by On-Waves
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <stdlib.h>
+#include <osmocom/core/application.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/msgb.h>
+
+#include <errno.h>
+
+#include <string.h>
+
+#define CHECK_RC(rc)	\
+	if (rc != 0) {	\
+		printf("Operation failed rc=%d on %s:%d\n", rc, __FILE__, __LINE__); \
+		abort(); \
+	}
+
+static void test_msgb_api()
+{
+	struct msgb *msg = msgb_alloc_headroom(4096, 128, "data");
+	unsigned char *cptr = NULL;
+	int rc;
+
+	printf("Testing the msgb API\n");
+
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	cptr = msg->l1h = msgb_put(msg, 4);
+	printf("put(4) -> data%+d\n", cptr - msg->data);
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	cptr = msg->l2h = msgb_put(msg, 4);
+	printf("put(4) -> data%+d\n", cptr - msg->data);
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	cptr = msg->l3h = msgb_put(msg, 4);
+	printf("put(4) -> data%+d\n", cptr - msg->data);
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	cptr = msg->l4h = msgb_put(msg, 4);
+	printf("put(4) -> data%+d\n", cptr - msg->data);
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	OSMO_ASSERT(msgb_length(msg) == 16);
+	cptr = msgb_push(msg, 4);
+	printf("push(4) -> data%+d\n", cptr - msg->data);
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	OSMO_ASSERT(msgb_length(msg) == 20);
+	rc = msgb_trim(msg, 16);
+	printf("trim(16) -> %d\n", rc);
+	CHECK_RC(rc);
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_length(msg) == 16);
+
+	cptr = msgb_get(msg, 4);
+	printf("get(4) -> data%+d\n", cptr - msg->data);
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	OSMO_ASSERT(msgb_test_invariant(msg));
+	OSMO_ASSERT(msgb_length(msg) == 12);
+
+	printf("Test msgb_hexdump\n");
+	msg->l1h = msg->head;
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	msg->l3h = msg->data;
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+	msg->l3h = msg->head - 1;
+	printf("Buffer: %s\n", msgb_hexdump(msg));
+
+	msgb_free(msg);
+}
+
+static struct log_info info = {};
+
+int main(int argc, char **argv)
+{
+	osmo_init_logging(&info);
+
+	test_msgb_api();
+
+	printf("Success.\n");
+
+	return 0;
+}