diff --git a/acinclude.m4 b/acinclude.m4
index 612a4d1a918..c2daf4bbc3c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1422,6 +1422,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
       ;;
   esac
 
+  AM_CONDITIONAL(HAVE_NDBCLUSTER_DB, test "have_ndbcluster" = "yes")
   AC_SUBST(ndbcluster_includes)
   AC_SUBST(ndbcluster_libs)
   AC_SUBST(ndbcluster_system_libs)
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 266cc7799b0..bebb84c11db 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -17,7 +17,9 @@
 
 ## Process this file with automake to create Makefile.in
 
+if HAVE_NDBCLUSTER_DB
 SUBDIRS = ndb
+endif
 
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test