diff --git a/mysql-test/t/ndb_config.test b/mysql-test/t/ndb_config.test
index a79973515b2..ea78a32b1ba 100644
--- a/mysql-test/t/ndb_config.test
+++ b/mysql-test/t/ndb_config.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
 --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null
diff --git a/ndb/tools/Makefile.am b/ndb/tools/Makefile.am
index 1f11122fb70..89830129576 100644
--- a/ndb/tools/Makefile.am
+++ b/ndb/tools/Makefile.am
@@ -32,7 +32,7 @@ ndb_restore_SOURCES = restore/restore_main.cpp \
                       restore/consumer_printer.cpp \
                       restore/Restore.cpp
 
-ndb_config_SOURCES = config.cpp \
+ndb_config_SOURCES = ndb_config.cpp \
 	../src/mgmsrv/Config.cpp \
 	../src/mgmsrv/ConfigInfo.cpp \
 	../src/mgmsrv/InitConfigFileParser.cpp
diff --git a/ndb/tools/config.cpp b/ndb/tools/ndb_config.cpp
similarity index 100%
rename from ndb/tools/config.cpp
rename to ndb/tools/ndb_config.cpp