diff --git a/tests/msg_queue_print/main.c b/tests/msg_queue_print/main.c
index 4ca41ab76f..0a2523471b 100644
--- a/tests/msg_queue_print/main.c
+++ b/tests/msg_queue_print/main.c
@@ -42,6 +42,6 @@ int main(void)
     }
 
     msg_queue_print();
-    printf("DONE");
+    puts("DONE");
     return 0;
 }
diff --git a/tests/msg_queue_print/tests/01-run.py b/tests/msg_queue_print/tests/01-run.py
index 8dbd3756cf..bc1ce91703 100755
--- a/tests/msg_queue_print/tests/01-run.py
+++ b/tests/msg_queue_print/tests/01-run.py
@@ -8,17 +8,21 @@
 
 # @author      Julian Holzwarth <julian.holzwarth@fu-berlin.de>
 
+import os
 import sys
 from testrunner import run
 
 
 def testfunc(child):
     child.expect("No message queue")
-    child.expect("Message queue of thread 2")
+    child.expect(r"Message queue of thread \d+\r\n")
     child.expect_exact('size: 8 (avail: 0)')
-    child.expect("Message queue of thread 2")
+    child.expect(r"Message queue of thread \d+\r\n")
     child.expect_exact('size: 8 (avail: 8)')
-    child.expect_exact('type: 0x0000, content: 0 ((nil))')
+    if os.environ.get('BOARD') == 'native':
+        child.expect_exact('type: 0x0000, content: 0 ((nil))')
+    else:
+        child.expect(r'type: 0x0000, content: 0 \((0x)?0+\)')
     child.expect_exact('type: 0x0001, content: 1 (0x1)')
     child.expect_exact('type: 0x0002, content: 2 (0x2)')
     child.expect_exact('type: 0x0003, content: 3 (0x3)')