diff --git a/utils/nightly/gmsh_linux.ctest b/utils/nightly/gmsh_linux32.ctest
similarity index 100%
rename from utils/nightly/gmsh_linux.ctest
rename to utils/nightly/gmsh_linux32.ctest
diff --git a/utils/nightly/gmsh_linux_nightly.cron b/utils/nightly/gmsh_linux32_nightly.cron
similarity index 63%
rename from utils/nightly/gmsh_linux_nightly.cron
rename to utils/nightly/gmsh_linux32_nightly.cron
index cf8bc1677f3531e1407b91bf50979539755adaed..02d78082d7896bb8ea7043bc1b46c461b38b83b0 100644
--- a/utils/nightly/gmsh_linux_nightly.cron
+++ b/utils/nightly/gmsh_linux32_nightly.cron
@@ -1,4 +1,4 @@
 #
 # this will launch a new build every night at 1h01
 #
-1 1 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1
+1 1 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux32_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1
diff --git a/utils/nightly/gmsh_win_nightly.ctest b/utils/nightly/gmsh_linux32_nightly.ctest
similarity index 91%
rename from utils/nightly/gmsh_win_nightly.ctest
rename to utils/nightly/gmsh_linux32_nightly.ctest
index 20894a3d6c2071b3f0cd82d8018db41c67aff9a5..fe41ccb12a4a122b61dcbadb99a03dfc519fa943 100644
--- a/utils/nightly/gmsh_win_nightly.ctest
+++ b/utils/nightly/gmsh_linux32_nightly.ctest
@@ -6,4 +6,4 @@
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
 set(EXTRA_VERSION "-svn")
-include(gmsh_win.ctest)
+include(gmsh_linux32.ctest)
diff --git a/utils/nightly/gmsh_linux_test.ctest b/utils/nightly/gmsh_linux32_test.ctest
similarity index 88%
rename from utils/nightly/gmsh_linux_test.ctest
rename to utils/nightly/gmsh_linux32_test.ctest
index ba1b44f117ee0c9fdc6491c31ae5013818ca5b2d..9b663d9e457415f141ceb0d6fa00e8e638934072 100644
--- a/utils/nightly/gmsh_linux_test.ctest
+++ b/utils/nightly/gmsh_linux32_test.ctest
@@ -4,4 +4,4 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(EXTRA_VERSION "-svn")
-include(gmsh_linux.ctest)
+include(gmsh_linux32.ctest)
diff --git a/utils/nightly/gmsh_win.ctest b/utils/nightly/gmsh_win32.ctest
similarity index 100%
rename from utils/nightly/gmsh_win.ctest
rename to utils/nightly/gmsh_win32.ctest
diff --git a/utils/nightly/gmsh_win_nightly.bat b/utils/nightly/gmsh_win32_nightly.bat
similarity index 58%
rename from utils/nightly/gmsh_win_nightly.bat
rename to utils/nightly/gmsh_win32_nightly.bat
index 6429a862c91570a77244ac1a825090853eaae61e..fffe6b9b13d7b4ba2e98c1760b22e7a1450baed3 100755
--- a/utils/nightly/gmsh_win_nightly.bat
+++ b/utils/nightly/gmsh_win32_nightly.bat
@@ -3,4 +3,4 @@
 C:
 chdir C:\cygwin\bin
 
-bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1"
+bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win32_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1"
diff --git a/utils/nightly/gmsh_linux_nightly.ctest b/utils/nightly/gmsh_win32_nightly.ctest
similarity index 91%
rename from utils/nightly/gmsh_linux_nightly.ctest
rename to utils/nightly/gmsh_win32_nightly.ctest
index 3a3b1b0226a0172c06535ffa18f744228688ccbf..6895bf013e27c21deaaab17caa06b6af4ae43d36 100644
--- a/utils/nightly/gmsh_linux_nightly.ctest
+++ b/utils/nightly/gmsh_win32_nightly.ctest
@@ -6,4 +6,4 @@
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
 set(EXTRA_VERSION "-svn")
-include(gmsh_linux.ctest)
+include(gmsh_win32.ctest)
diff --git a/utils/nightly/gmsh_win_test.ctest b/utils/nightly/gmsh_win32_test.ctest
old mode 100755
new mode 100644
similarity index 89%
rename from utils/nightly/gmsh_win_test.ctest
rename to utils/nightly/gmsh_win32_test.ctest
index 06d668836b58a3545ffddb0333f495ff730fd0d9..154fb0475c423c47dd5c14e19f5d237b1177a21c
--- a/utils/nightly/gmsh_win_test.ctest
+++ b/utils/nightly/gmsh_win32_test.ctest
@@ -4,4 +4,4 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(EXTRA_VERSION "-svn")
-include(gmsh_win.ctest)
+include(gmsh_win32.ctest)
diff --git a/utils/nightly/gmsh_win64_test.ctest b/utils/nightly/gmsh_win64_test.ctest
old mode 100755
new mode 100644