diff --git a/src/MGmol.cc b/src/MGmol.cc
index 681efacc..7c29c721 100644
--- a/src/MGmol.cc
+++ b/src/MGmol.cc
@@ -1112,7 +1112,6 @@ void MGmol<OrbitalsType>::dumpRestart()
 
         // create restart file
         std::string filename(std::string(ct.out_restart_file));
-        if (ct.out_restart_file_naming_strategy) filename += "0";
         HDFrestart h5restartfile(
             filename, myPEenv, gdim, ct.out_restart_file_type);
 
diff --git a/src/md.cc b/src/md.cc
index dfb4dfe6..dc2857eb 100644
--- a/src/md.cc
+++ b/src/md.cc
@@ -242,9 +242,12 @@ int MGmol<OrbitalsType>::dumpMDrestartFile(OrbitalsType& orbitals, Ions& ions,
     std::string filename(std::string(ct.out_restart_file));
     // add an integer corresponding to attempt number/count
     // to allow several attempts at creating and writing file
-    std::stringstream s;
-    s << count;
-    filename += s.str();
+    if (count > 0)
+    {
+        std::stringstream s;
+        s << count;
+        filename += s.str();
+    }
 
     HDFrestart h5file(filename, myPEenv, gdim, ct.out_restart_file_type);
 
diff --git a/tests/MD_D72/test.py b/tests/MD_D72/test.py
index 17b70de2..3f98b2bd 100755
--- a/tests/MD_D72/test.py
+++ b/tests/MD_D72/test.py
@@ -42,7 +42,7 @@
     print(line)
 
 #run MD
-command = "ls -ld snapshot0* | awk '{ print $9 }' | tail -n1"
+command = "ls -ld snapshot* | awk '{ print $9 }' | tail -n1"
 print(command)
 restart_file = subprocess.check_output(command,shell=True)
 restart_file=str(restart_file[:-1],'utf-8')
diff --git a/tests/MD_MVP/md.cfg b/tests/MD_MVP/md.cfg
index 83d5aa4c..e30a8807 100644
--- a/tests/MD_MVP/md.cfg
+++ b/tests/MD_MVP/md.cfg
@@ -34,6 +34,6 @@ solver=MVP
 nb_inner_it=1
 mixing=1.
 [Restart]
-input_filename=wave.out
+input_filename=snapshotMVP
 input_level=3
 output_level=3
diff --git a/tests/MD_MVP/test.py b/tests/MD_MVP/test.py
index 489c9c8c..47b5462d 100755
--- a/tests/MD_MVP/test.py
+++ b/tests/MD_MVP/test.py
@@ -42,20 +42,20 @@
 
 #run MD
 for i in range(2):
-  command = "ls -ld snapshot0* | awk '{ print $9 }' | tail -n1"
+  command = "ls -ld snapshot* | awk '{ print $9 }' | tail -n1"
   print(command)
   restart_file = subprocess.check_output(command,shell=True)
   restart_file=str(restart_file[:-1],'utf-8')
   print(restart_file)
 
-  os.rename(restart_file, 'wave.out')
+  os.rename(restart_file, 'snapshotMVP')
 
   #run MGmol
   command = "{} {} -c {} -i {}".format(mpicmd,exe,inp2,coords)
   output2 = subprocess.check_output(command,shell=True)
 
   #remove used restart files
-  shutil.rmtree('wave.out')
+  shutil.rmtree('snapshotMVP')
 
   #analyse mgmol standard output
   lines=output2.split(b'\n')
@@ -81,7 +81,7 @@
         sys.exit(1)
 
 #remove last restart files
-command = "ls -ld snapshot0* | awk '{ print $9 }' | tail -n1"
+command = "ls -ld snapshot* | awk '{ print $9 }' | tail -n1"
 restart_file = subprocess.check_output(command,shell=True)
 restart_file=str(restart_file[:-1],'utf-8')
 shutil.rmtree(restart_file)
diff --git a/tests/ShortSighted/test.py b/tests/ShortSighted/test.py
index 27da7f7d..68a617aa 100755
--- a/tests/ShortSighted/test.py
+++ b/tests/ShortSighted/test.py
@@ -42,7 +42,7 @@
     print(line)
 
 #run MD
-command = "ls -ld snapshot0* | awk '{ print $9 }' | tail -n1"
+command = "ls -ld snapshot* | awk '{ print $9 }' | tail -n1"
 print(command)
 restart_file = subprocess.check_output(command,shell=True)
 restart_file=str(restart_file[:-1],'utf-8')