diff --git a/test/compiler/sncExOpt_DuplOpt.st b/test/compiler/exOpt_DuplOpt.st
similarity index 97%
rename from test/compiler/sncExOpt_DuplOpt.st
rename to test/compiler/exOpt_DuplOpt.st
index 3af3c4497332f31c4eee786e4d8e6b01acfd04e7..75dc901ccd1dc4cef4bbc36456d9fd89d18ce54a 100644
--- a/test/compiler/sncExOpt_DuplOpt.st
+++ b/test/compiler/exOpt_DuplOpt.st
@@ -2,7 +2,7 @@
 This file is distributed subject to a Software License Agreement found
 in the file LICENSE that is included with this distribution.
 \*************************************************************************/
-program snctest
+program exOpt_DuplOptTest
 float v;
 assign v to "grw:xxxExample";
 monitor v;
diff --git a/test/compiler/sncExOpt_UnrecOpt.st b/test/compiler/exOpt_UnrecOpt.st
similarity index 97%
rename from test/compiler/sncExOpt_UnrecOpt.st
rename to test/compiler/exOpt_UnrecOpt.st
index 8984c6e83db2dab5b236c1a6934ccf22cf171afc..0164504e480ccfa691110baf0a4028d1b4a43529 100644
--- a/test/compiler/sncExOpt_UnrecOpt.st
+++ b/test/compiler/exOpt_UnrecOpt.st
@@ -2,7 +2,7 @@
 This file is distributed subject to a Software License Agreement found
 in the file LICENSE that is included with this distribution.
 \*************************************************************************/
-program snctest
+program exOpt_UnrecOptTest
 float v;
 assign v to "grw:xxxExample";
 monitor v;
diff --git a/test/compiler/snc_test.plt b/test/compiler/snc_test.plt
index 2b894e555c04752427db696e2c7140f2ba765990..c9b07567a1ea4dc381e477083c476ae6b0ef9786 100644
--- a/test/compiler/snc_test.plt
+++ b/test/compiler/snc_test.plt
@@ -6,7 +6,7 @@ use Test::More;
 
 my $success = {
   cast => 0,
-  sncExOpt_DuplOpt => 0,
+  exOpt_DuplOpt => 0,
   foreignTypes => 0,
   sync_not_monitored => 0,
   syncq_not_monitored => 0,
@@ -16,7 +16,7 @@ my $success = {
 };
 
 my $warning = {
-  sncExOpt_UnrecOpt => 1,
+  exOpt_UnrecOpt => 1,
   state_not_reachable => 3,
   syncq_no_size => 1,
 };
diff --git a/test/validate/Makefile b/test/validate/Makefile
index c95dbeadbfe3ea16ab61f9173043d446e28b1f26..a992a5a376aaa54cd5e2dd15b567ca1db202b046 100644
--- a/test/validate/Makefile
+++ b/test/validate/Makefile
@@ -44,12 +44,12 @@ REGRESSION_TESTS_WITHOUT_DB += assign
 REGRESSION_TESTS_WITHOUT_DB += change
 REGRESSION_TESTS_WITHOUT_DB += commaOperator
 REGRESSION_TESTS_WITHOUT_DB += local
+REGRESSION_TESTS_WITHOUT_DB += opttVar
 REGRESSION_TESTS_WITHOUT_DB += pvSync
+REGRESSION_TESTS_WITHOUT_DB += safeModeNotAssigned
 REGRESSION_TESTS_WITHOUT_DB += safeMonitor
-REGRESSION_TESTS_WITHOUT_DB += opttVar
 REGRESSION_TESTS_WITHOUT_DB += sizeof
 REGRESSION_TESTS_WITHOUT_DB += userfunc
-REGRESSION_TESTS_WITHOUT_DB += safeModeNotAssigned
 
 REGRESSION_TESTS += $(REGRESSION_TESTS_WITHOUT_DB)
 REGRESSION_TESTS += $(REGRESSION_TESTS_WITH_DB)