diff --git a/tests/cpp11_thread/Makefile b/tests/cpp11_thread/Makefile
index 012bcc7f2e6f7ae3597eab7140aed586983e4012..ee3e7f117e589a26973f4e0eec9dcc675b498899 100644
--- a/tests/cpp11_thread/Makefile
+++ b/tests/cpp11_thread/Makefile
@@ -24,3 +24,6 @@ USEMODULE += xtimer
 USEMODULE += timex
 
 include $(RIOTBASE)/Makefile.include
+
+test:
+	tests/01-run.py
diff --git a/tests/cpp11_thread/tests/01-run.py b/tests/cpp11_thread/tests/01-run.py
new file mode 100755
index 0000000000000000000000000000000000000000..6636188ea97823465535114a27fcc96508775996
--- /dev/null
+++ b/tests/cpp11_thread/tests/01-run.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 Kaspar Schleiser <kaspar@schleiser.de>
+# Copyright (C) 2016 Takuo Yonezawa <Yonezawa-T2@mail.dnp.co.jp>
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+
+import os
+import sys
+
+sys.path.append(os.path.join(os.environ['RIOTBASE'], 'dist/tools/testrunner'))
+import testrunner
+
+def testfunc(child):
+
+    child.expect_exact("************ C++ thread test ***********")
+    child.expect_exact("Creating one thread and passing an argument ...")
+    child.expect_exact("Done")
+    child.expect_exact("Creating detached thread ...")
+    child.expect_exact("Done")
+    child.expect_exact("Join on 'finished' thread ...")
+    child.expect_exact("Done")
+    child.expect_exact("Join on 'running' thread ...")
+    child.expect_exact("Done")
+    child.expect_exact("Testing sleep_for ...")
+    child.expect_exact("Done")
+    child.expect_exact("Testing sleep_until ...")
+    child.expect_exact("Done")
+    child.expect_exact("Swapping two threads ...")
+    child.expect_exact("Done")
+    child.expect_exact("Move constructor ...")
+    child.expect_exact("Done")
+    child.expect_exact("Bye, bye.")
+    child.expect_exact("******************************************")
+
+if __name__ == "__main__":
+    sys.exit(testrunner.run(testfunc))