diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 5bac436e4f9..2079398e942 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1604,14 +1604,7 @@ then
     fi
   fi
 
-  if [ ! -z "$USE_NDBCLUSTER" ]
-  then
-    if [ -z "$USE_RUNNING_NDBCLUSTER" ]
-    then
-      # Kill any running ndbcluster stuff
-      ./ndb/ndbcluster --data-dir=$MYSQL_TEST_DIR/var --port-base=$NDBCLUSTER_PORT --stop
-    fi
-  fi
+  stop_ndbcluster
 
   # Remove files that can cause problems
   $RM -rf $MYSQL_TEST_DIR/var/ndbcluster