diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h
index 9ad0967854f0ec17101b29c40fd1b7dfafdf38da..d3bb44c1523b5675c625703666a06e697deccc0c 100644
--- a/ndb/include/mgmapi/mgmapi_config_parameters.h
+++ b/ndb/include/mgmapi/mgmapi_config_parameters.h
@@ -74,6 +74,8 @@
 #define CFG_LOGLEVEL_GREP             146
 #define CFG_LOG_DESTINATION           147
 
+#define CFG_DB_DISCLESS               148
+
 #define CFG_NODE_ARBIT_RANK           200
 #define CFG_NODE_ARBIT_DELAY          201
 
diff --git a/ndb/src/common/mgmcommon/ConfigInfo.cpp b/ndb/src/common/mgmcommon/ConfigInfo.cpp
index 1766fbe967f65ad1af3a6da13ddebfc67d9965b2..c3e10dd3448928b99cab1054717edbe1eef4636e 100644
--- a/ndb/src/common/mgmcommon/ConfigInfo.cpp
+++ b/ndb/src/common/mgmcommon/ConfigInfo.cpp
@@ -888,6 +888,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     1,
     0x7FFFFFFF },
   
+
+  {
+    CFG_DB_DISCLESS,
+    "Discless",
+    "DB",
+    "Run wo/ disk",
+    ConfigInfo::USED,
+    true,
+    ConfigInfo::BOOL,
+    0,
+    0,
+    1},
+  
   {
     CFG_DB_ARBIT_TIMEOUT,
     "ArbitrationTimeout",
diff --git a/ndb/src/kernel/SimBlockList.cpp b/ndb/src/kernel/SimBlockList.cpp
index bc6262e072391aa0d9f611b2618fbe84fd739c12..c41b17e1919bc5677462682b4117470b8c63ded9 100644
--- a/ndb/src/kernel/SimBlockList.cpp
+++ b/ndb/src/kernel/SimBlockList.cpp
@@ -72,14 +72,15 @@ SimBlockList::load(const Configuration & conf){
 
   SimulatedBlock * fs = 0;
   {
-    char buf[100];
-    if(NdbEnv_GetEnv("NDB_NOFS", buf, 100) == 0){
-      fs = new (A_VALUE) Ndbfs(conf);
-    } else { 
+    Uint32 dl;
+    const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
+    if(p && !ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl){
       fs = new (A_VALUE) VoidFs(conf);
+    } else { 
+      fs = new (A_VALUE) Ndbfs(conf);
     }
   }
-
+  
   theList[0]  = new (A_VALUE) Dbacc(conf);
   theList[1]  = new (A_VALUE) Cmvmi(conf);
   theList[2]  = fs;