diff --git a/ndb/test/ndbapi/testDict.cpp b/ndb/test/ndbapi/testDict.cpp
index 1451c942362..e7597c26960 100644
--- a/ndb/test/ndbapi/testDict.cpp
+++ b/ndb/test/ndbapi/testDict.cpp
@@ -537,6 +537,7 @@ int runTestFragmentTypes(NDBT_Context* ctx, NDBT_Step* step){
   }
   
   const NdbDictionary::Table* pTab = ctx->getTab();
+  pNdb->getDictionary()->dropTable(pTab->getName());
 
   NdbDictionary::Table newTab(* pTab);
   // Set fragment type for table    
diff --git a/ndb/test/ndbapi/testScan.cpp b/ndb/test/ndbapi/testScan.cpp
index de60d68f213..3da0ceb6d8c 100644
--- a/ndb/test/ndbapi/testScan.cpp
+++ b/ndb/test/ndbapi/testScan.cpp
@@ -65,7 +65,7 @@ int runDropAllTablesExceptTestTable(NDBT_Context* ctx, NDBT_Step* step){
     }
 	    
     int res = GETNDB(step)->getDictionary()->dropTable(tab->getName());
-    if(res != -1){
+    if(res == -1){
       return NDBT_FAILED;
     }
   }
diff --git a/ndb/test/src/NDBT_Tables.cpp b/ndb/test/src/NDBT_Tables.cpp
index d0a46604316..8af72a75efa 100644
--- a/ndb/test/src/NDBT_Tables.cpp
+++ b/ndb/test/src/NDBT_Tables.cpp
@@ -803,6 +803,7 @@ int
 NDBT_Tables::createAllTables(Ndb* pNdb, bool _temp, bool existsOk){
   
   for (int i=0; i < NDBT_Tables::getNumTables(); i++){
+    pNdb->getDictionary()->dropTable(NDBT_Tables::getTable(i)->getName());
     int ret= createTable(pNdb, 
 			 NDBT_Tables::getTable(i)->getName(), _temp, existsOk);
     if(ret)