diff --git a/ndb/test/ndbapi/bench/mainPopulate.cpp b/ndb/test/ndbapi/bench/mainPopulate.cpp
index 5f4b73a3eff..d017c2a3f4b 100644
--- a/ndb/test/ndbapi/bench/mainPopulate.cpp
+++ b/ndb/test/ndbapi/bench/mainPopulate.cpp
@@ -22,12 +22,12 @@
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <random.h>
+#include <NDBT.hpp>
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 int useTableLogging;
-int useIndexTables;
 #ifdef	__cplusplus
 }
 #endif
@@ -44,7 +44,6 @@ void usage(const char *prog)
   ndbout_c(
 	   "Usage: %s [-l]\n"
 	   "  -l                  Use logging and checkpointing on tables\n",
-	   "  -i                  Use index tables\n",
 	   prog);
   
   exit(1);
@@ -57,28 +56,26 @@ NDB_COMMAND(DbCreate, "DbCreate", "DbCreate", "DbCreate", 16384)
   int i;
   UserHandle *uh;
   
-  useTableLogging = useIndexTables = 0;
+  useTableLogging = 0;
   NDB_INIT(argv[0]);
   
   for(i = 1; i<argc; i++){
     if(strcmp(argv[i], "-l") == 0){
       useTableLogging = 1;
-    } else if(strcmp(argv[i], "-i") == 0){
-      useIndexTables = 1;
     } else {
       usage(argv[0]);
       return 0;
     }
   }
 
-  ndbout_c("Using %s tables and %s key storage",
-	   useTableLogging ? "logging" : "temporary",
-	   useIndexTables  ? "index" : "normal");
+  ndbout_c("Using %s tables",
+	   useTableLogging ? "logging" : "temporary");
   
   myRandom48Init(0x3e6f);
   
   uh = userDbConnect(1, "TEST_DB");
   dbPopulate(uh);
   userDbDisconnect(uh);
-  return(0);
+  
+  return NDBT_ProgramExit(NDBT_OK);
 }
diff --git a/ndb/test/ndbapi/bench/userInterface.cpp b/ndb/test/ndbapi/bench/userInterface.cpp
index 128d20dc9bb..683552c3133 100644
--- a/ndb/test/ndbapi/bench/userInterface.cpp
+++ b/ndb/test/ndbapi/bench/userInterface.cpp
@@ -134,7 +134,6 @@ userDbCommit(UserHandle *uh){
 extern "C" {
 #endif
 extern int useTableLogging;
-extern int useIndexTables;
 #ifdef	__cplusplus
 }
 #endif
@@ -377,7 +376,7 @@ create_table_subscriber(Ndb * pNdb){
       String, 
       MMBased,
       NotNullAttribute,
-      (useIndexTables ? IndexStorageAttribute : NormalStorageAttribute),
+      NormalStorageAttribute,
       0,
       1,
       16);
diff --git a/ndb/test/run-test/daily-devel-tests.txt b/ndb/test/run-test/daily-devel-tests.txt
index 69c27ca229f..2cdd39ffa4c 100644
--- a/ndb/test/run-test/daily-devel-tests.txt
+++ b/ndb/test/run-test/daily-devel-tests.txt
@@ -210,26 +210,26 @@ args:
 
 max-time: 180
 cmd: DbAsyncGenerator
-args: -t 60 -p 1
+args: -time 60 -p 1
 type: bench
 
 max-time: 180
 cmd: DbAsyncGenerator
-args: -t 60 -p 25
+args: -time 60 -p 25
 type: bench
 
 max-time: 180
 cmd: DbAsyncGenerator
-args: -t 60 -p 100
+args: -time 60 -p 100
 type: bench
 
 max-time: 180
 cmd: DbAsyncGenerator
-args: -t 60 -p 200
+args: -time 60 -p 200
 type: bench
 
 max-time: 180
 cmd: DbAsyncGenerator
-args: -t 60 -p 1 -proc 25
+args: -time 60 -p 1 -proc 25
 type: bench