diff --git a/tests/syntax/ghost-else.i b/tests/syntax/ghost_else.i
similarity index 100%
rename from tests/syntax/ghost-else.i
rename to tests/syntax/ghost_else.i
diff --git a/tests/syntax/ghost-else-bad.c b/tests/syntax/ghost_else_bad.c
similarity index 100%
rename from tests/syntax/ghost-else-bad.c
rename to tests/syntax/ghost_else_bad.c
diff --git a/tests/syntax/ghost-else-bad-oneline.i b/tests/syntax/ghost_else_bad_oneline.i
similarity index 100%
rename from tests/syntax/ghost-else-bad-oneline.i
rename to tests/syntax/ghost_else_bad_oneline.i
diff --git a/tests/syntax/oracle/ghost-else-bad.0.res.oracle b/tests/syntax/oracle/ghost-else-bad.0.res.oracle
deleted file mode 100644
index 1023844ff3054e8cf861b861085685eca46ec0e5..0000000000000000000000000000000000000000
--- a/tests/syntax/oracle/ghost-else-bad.0.res.oracle
+++ /dev/null
@@ -1,5 +0,0 @@
-[kernel] Parsing tests/syntax/ghost-else-bad.c (with preprocessing)
-[kernel] tests/syntax/ghost-else-bad.c:20: User Error: Cannot resolve variable z
-[kernel] User Error: stopping on file "tests/syntax/ghost-else-bad.c" that has errors. Add
-  '-kernel-msg-key pp' for preprocessing command.
-[kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/ghost-else-bad.1.err.oracle b/tests/syntax/oracle/ghost-else-bad.1.err.oracle
deleted file mode 100644
index a462608f4fbd5cf7c65dbe989be079cd1601e57d..0000000000000000000000000000000000000000
--- a/tests/syntax/oracle/ghost-else-bad.1.err.oracle
+++ /dev/null
@@ -1 +0,0 @@
-Warning: tests/syntax/ghost-else-bad.c:32: Invalid ghost else ignored
diff --git a/tests/syntax/oracle/ghost-else.res.oracle b/tests/syntax/oracle/ghost_else.res.oracle
similarity index 96%
rename from tests/syntax/oracle/ghost-else.res.oracle
rename to tests/syntax/oracle/ghost_else.res.oracle
index 870a783d7d4771730c8852960ace204e950fc49a..8714af3e322264912e9d9a4c5e0e2746502b232c 100644
--- a/tests/syntax/oracle/ghost-else.res.oracle
+++ b/tests/syntax/oracle/ghost_else.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/syntax/ghost-else.i (no preprocessing)
+[kernel] Parsing tests/syntax/ghost_else.i (no preprocessing)
 /* Generated by Frama-C */
 /*  run.config
    OPT: -no-autoload-plugins -keep-comments -print
diff --git a/tests/syntax/oracle/ghost_else_bad.0.res.oracle b/tests/syntax/oracle/ghost_else_bad.0.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..b1fe57ef8b507cecf45fd995d4f31ce9c576d741
--- /dev/null
+++ b/tests/syntax/oracle/ghost_else_bad.0.res.oracle
@@ -0,0 +1,5 @@
+[kernel] Parsing tests/syntax/ghost_else_bad.c (with preprocessing)
+[kernel] tests/syntax/ghost_else_bad.c:20: User Error: Cannot resolve variable z
+[kernel] User Error: stopping on file "tests/syntax/ghost_else_bad.c" that has errors. Add
+  '-kernel-msg-key pp' for preprocessing command.
+[kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/ghost_else_bad.1.err.oracle b/tests/syntax/oracle/ghost_else_bad.1.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..b7f5dc572a00637862d9948bffdcdd1ccea254e5
--- /dev/null
+++ b/tests/syntax/oracle/ghost_else_bad.1.err.oracle
@@ -0,0 +1 @@
+Warning: tests/syntax/ghost_else_bad.c:32: Invalid ghost else ignored
diff --git a/tests/syntax/oracle/ghost-else-bad.1.res.oracle b/tests/syntax/oracle/ghost_else_bad.1.res.oracle
similarity index 64%
rename from tests/syntax/oracle/ghost-else-bad.1.res.oracle
rename to tests/syntax/oracle/ghost_else_bad.1.res.oracle
index 3a7ccc5655e32894b3939a956c80dbf011fe7e3e..fae04332c746c2c521444309dc8b41a64d49c683 100644
--- a/tests/syntax/oracle/ghost-else-bad.1.res.oracle
+++ b/tests/syntax/oracle/ghost_else_bad.1.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/syntax/ghost-else-bad.c (with preprocessing)
+[kernel] Parsing tests/syntax/ghost_else_bad.c (with preprocessing)
 /* Generated by Frama-C */
 void if_ghost_else_block_bad(int x, int y)
 {
diff --git a/tests/syntax/oracle/ghost-else-bad.2.res.oracle b/tests/syntax/oracle/ghost_else_bad.2.res.oracle
similarity index 71%
rename from tests/syntax/oracle/ghost-else-bad.2.res.oracle
rename to tests/syntax/oracle/ghost_else_bad.2.res.oracle
index 0fb6dc879ca32d041f42d358de3964d59a30769d..4187bc4f1214e00be1ac9b6fb84cb3da0f664ea4 100644
--- a/tests/syntax/oracle/ghost-else-bad.2.res.oracle
+++ b/tests/syntax/oracle/ghost_else_bad.2.res.oracle
@@ -1,5 +1,5 @@
-[kernel] Parsing tests/syntax/ghost-else-bad.c (with preprocessing)
-[kernel] tests/syntax/ghost-else-bad.c:47: 
+[kernel] Parsing tests/syntax/ghost_else_bad.c (with preprocessing)
+[kernel] tests/syntax/ghost_else_bad.c:47: 
   syntax error:
   Location: between lines 47 and 49, before or at token: else
   45      if(x){
diff --git a/tests/syntax/oracle/ghost-else-bad-oneline.res.oracle b/tests/syntax/oracle/ghost_else_bad_oneline.res.oracle
similarity index 71%
rename from tests/syntax/oracle/ghost-else-bad-oneline.res.oracle
rename to tests/syntax/oracle/ghost_else_bad_oneline.res.oracle
index df16567ef5ded917da8a68560edf2039e5a26e4e..ded857214d7df397ddd4536ad0c1e3202448c04c 100644
--- a/tests/syntax/oracle/ghost-else-bad-oneline.res.oracle
+++ b/tests/syntax/oracle/ghost_else_bad_oneline.res.oracle
@@ -1,5 +1,5 @@
-[kernel] Parsing tests/syntax/ghost-else-bad-oneline.i (no preprocessing)
-[kernel] tests/syntax/ghost-else-bad-oneline.i:6: 
+[kernel] Parsing tests/syntax/ghost_else_bad_oneline.i (no preprocessing)
+[kernel] tests/syntax/ghost_else_bad_oneline.i:6: 
   syntax error:
   Location: between lines 6 and 8, before or at token: