diff --git a/.bzrignore b/.bzrignore
index 02a97d7d1af..eae47b882d0 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1107,3 +1107,5 @@ vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
 VC++Files/client/mysql_amd64.dsp
+client/mysqltestmanager-pwgen
+client/mysqltestmanagerc
diff --git a/configure.in b/configure.in
index c3c792e7339..c7e93c9676a 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,6 @@ sinclude(config/ac-macros/ha_blackhole.m4)
 sinclude(config/ac-macros/ha_example.m4)
 sinclude(config/ac-macros/ha_federated.m4)
 sinclude(config/ac-macros/ha_innodb.m4)
-sinclude(config/ac-macros/ha_isam.m4)
 sinclude(config/ac-macros/ha_ndbcluster.m4)
 sinclude(config/ac-macros/ha_tina.m4)
 sinclude(config/ac-macros/large_file.m4)