diff --git a/tests/cpp11_condition_variable/Makefile b/tests/cpp11_condition_variable/Makefile
index d7ce2db60977b534b8e21d52c324620ce599fbac..7ce7abfaa99b35ec17acca02115fecb85bfc5219 100644
--- a/tests/cpp11_condition_variable/Makefile
+++ b/tests/cpp11_condition_variable/Makefile
@@ -24,3 +24,6 @@ USEMODULE += xtimer
 USEMODULE += timex
 
 include $(RIOTBASE)/Makefile.include
+
+test:
+	tests/01-run.py
diff --git a/tests/cpp11_condition_variable/tests/01-run.py b/tests/cpp11_condition_variable/tests/01-run.py
new file mode 100755
index 0000000000000000000000000000000000000000..3ac6d799f1c1b2fdf33310a9f883e9d8b7eeb49f
--- /dev/null
+++ b/tests/cpp11_condition_variable/tests/01-run.py
@@ -0,0 +1,31 @@
+#!/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++ condition_variable test ***********")
+    child.expect_exact("Wait with predicate and notify one ...")
+    child.expect_exact("Done")
+    child.expect_exact("Wait and notify all ...")
+    child.expect_exact("Done")
+    child.expect_exact("Wait for ...")
+    child.expect_exact("Done")
+    child.expect_exact("Wait until ...")
+    child.expect_exact("Done")
+    child.expect_exact("Bye, bye.")
+    child.expect_exact("******************************************************")
+
+if __name__ == "__main__":
+    sys.exit(testrunner.run(testfunc))