diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 31804714900..6e706ba022e 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -60,7 +60,7 @@ TEST_DIRS = t r include std_data std_data/parts \
 	suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
 	suite/bugs/data suite/bugs/t suite/bugs/r \
 	suite/federated \
-	suite/funcs_1 suite/funcs_1/bitdata suite/funcs_1/data \
+	suite/funcs_1 suite/funcs_1/bitdata \
 	suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \
 	suite/funcs_1/t suite/funcs_1/views suite/funcs_1/cursors \
 	suite/funcs_1/datadict suite/funcs_1/storedproc suite/funcs_1/triggers \
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 50cff8578c9..89ce40a891c 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -369,13 +369,12 @@ fi
 # NDB Cluster
 if [ x$NDBCLUSTER = x1 ]; then
   ( cd ndb            ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
-  ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
   $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
   $CP $BASE/ndb-stage@pkgdatadir@/* $BASE/share/mysql/.
   $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include
-  $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1
+  $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/.
   rm -rf $BASE/ndb-stage
 fi