diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index e565521a8b0..cb34bab7ab1 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -112,7 +112,9 @@ TEST_DIRS = t r include std_data std_data/parts collections \
 	suite/engines suite/engines/funcs suite/engines/iuds suite/engines/rr_trx \
 	suite/engines/funcs/r suite/engines/funcs/t suite/engines/iuds/r \
 	suite/engines/iuds/t suite/engines/rr_trx/include suite/engines/rr_trx/r \
-	suite/engines/rr_trx/t
+	suite/engines/rr_trx/t \
+        suite/optimizer_unfixed_bugs/t \
+        suite/optimizer_unfixed_bugs/r
 
 # Used by dist-hook and install-data-local to copy all
 # test files into either dist or install directory