diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp
index f7de43aea20..f72b9dee80b 100644
--- a/storage/ndb/test/ndbapi/testDict.cpp
+++ b/storage/ndb/test/ndbapi/testDict.cpp
@@ -321,7 +321,11 @@ int runCreateAndDropAtRandom(NDBT_Context* ctx, NDBT_Step* step)
     }
     i++;
   }
-
+  
+  for (Uint32 i = 0; i<numTables; i++)
+    if (tabList[i])
+      pDic->dropTable(NDBT_Tables::getTable(i)->getName());
+  
   delete [] tabList;
   return result;
 }
diff --git a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt
index c972d432375..b8e744e2ad2 100644
--- a/storage/ndb/test/run-test/daily-basic-tests.txt
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt
@@ -525,7 +525,7 @@ max-time: 1000
 cmd: testNodeRestart
 args: -n Bug25554 T1
 
-max-time: 1000
+max-time: 3000
 cmd: testNodeRestart
 args: -n Bug25984