diff --git a/rel/files/app.config b/rel/files/app.config
index 86ef3a181..3fe141724 100644
--- a/rel/files/app.config
+++ b/rel/files/app.config
@@ -7,9 +7,6 @@
  {sasl, [
 	{sasl_error_logger, {file, "log/emqttd_sasl.log"}}
  ]},
- {mnesia, [
-	{dir, "data/mnesia"}
- ]},
  {ssl, [
     %{versions, ['tlsv1.2', 'tlsv1.1']}
  ]},
diff --git a/rel/files/vm.args b/rel/files/vm.args
index 4ff3744f2..19a9dbfa0 100644
--- a/rel/files/vm.args
+++ b/rel/files/vm.args
@@ -1,9 +1,20 @@
+##-------------------------------------------------------------------------
 ## Name of the node
+##-------------------------------------------------------------------------
 -name emqttd@127.0.0.1
 
 ## Cookie for distributed erlang
 -setcookie emqttdsecretcookie
 
+##-------------------------------------------------------------------------
+## Mnesia db
+##-------------------------------------------------------------------------
+-mnesia dir "data/mnesia/test"
+
+##-------------------------------------------------------------------------
+## Flags
+##-------------------------------------------------------------------------
+
 ## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive
 ## (Disabled by default..use with caution!)
 ##-heart
@@ -16,6 +27,10 @@
 ## max process numbers
 +P 1000000
 
+##-------------------------------------------------------------------------
+## Env
+##-------------------------------------------------------------------------
+
 ## Increase number of concurrent ports/sockets
 -env ERL_MAX_PORTS 4096