diff --git a/tests/cpp11_mutex/Makefile b/tests/cpp11_mutex/Makefile
index a9e4cdaf49fbec605256a191def6c01ef2f76ab8..29abb02fec777bb06900b3431a4ac6d16ebe0905 100644
--- a/tests/cpp11_mutex/Makefile
+++ b/tests/cpp11_mutex/Makefile
@@ -23,3 +23,6 @@ USEMODULE += cpp11-compat
 USEMODULE += xtimer
 
 include $(RIOTBASE)/Makefile.include
+
+test:
+	tests/01-run.py
diff --git a/tests/cpp11_mutex/tests/01-run.py b/tests/cpp11_mutex/tests/01-run.py
new file mode 100755
index 0000000000000000000000000000000000000000..5be11d836abaa3b5ca8509ddb97f164fa55c5923
--- /dev/null
+++ b/tests/cpp11_mutex/tests/01-run.py
@@ -0,0 +1,27 @@
+#!/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++ mutex test ***********")
+    child.expect_exact("Lock and unlock ...")
+    child.expect_exact("Done")
+    child.expect_exact("Try_lock ...")
+    child.expect_exact("Done")
+    child.expect_exact("Bye, bye.")
+    child.expect_exact("*****************************************")
+
+if __name__ == "__main__":
+    sys.exit(testrunner.run(testfunc))