diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
new file mode 100644
index 00000000000..ddb79205357
--- /dev/null
+++ b/mysql-test/t/disabled.def
@@ -0,0 +1,16 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarely.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#      <testcasename>  : Comment test
+#
+#  Don't use any TAB characters for whitespace.
+#
+##############################################################################
+
+rpl_relayrotate : Unstable test case, bug#12429
+rpl_until       : Unstable test case, bug#12429
+rpl_deadlock    : Unstable test case, bug#12429
+kill            : Unstable test case, bug#9712