diff --git a/test/validate/Makefile b/test/validate/Makefile
index ebe1bc65287a9fa10cfe5430a2d823362e7dad58..5b9c0225a1e36b9d97b6b2aac61141695cadf2b4 100644
--- a/test/validate/Makefile
+++ b/test/validate/Makefile
@@ -12,22 +12,23 @@ SNCFLAGS_vxWorks += -nil-
 
 #  Sequence programs and/or object files to create
 TESTPROD_HOST += decl
-TESTPROD_HOST += sncDelay
-TESTPROD_HOST += sncEntry
-TESTPROD_HOST += sncEntryOpte
-TESTPROD_HOST += sncEntryVar
-TESTPROD_HOST += sncExitOptx
-TESTPROD_HOST += sncOptt
+TESTPROD_HOST += delay
+TESTPROD_HOST += entry
+TESTPROD_HOST += entryOpte
+TESTPROD_HOST += entryVar
+TESTPROD_HOST += exitOptx
+TESTPROD_HOST += optt
 TESTPROD_HOST += stop
 TESTPROD_HOST += subscript
 TESTPROD_HOST += syncq
 
 REGRESSION_TESTS_WITH_DB += bittypes
 REGRESSION_TESTS_WITH_DB += evflag
-REGRESSION_TESTS_WITH_DB += norace
 REGRESSION_TESTS_WITH_DB += pvGet
 REGRESSION_TESTS_WITH_DB += pvPutAsync
 
+REGRESSION_TESTS_WITH_DB += norace
+
 # uncomment this test to see race
 # fail (safe mode off)
 #REGRESSION_TESTS_WITH_DB += race
@@ -38,7 +39,7 @@ REGRESSION_TESTS_WITHOUT_DB += change
 REGRESSION_TESTS_WITHOUT_DB += local
 REGRESSION_TESTS_WITHOUT_DB += pvSync
 REGRESSION_TESTS_WITHOUT_DB += safeMonitor
-REGRESSION_TESTS_WITHOUT_DB += sncOpttVar
+REGRESSION_TESTS_WITHOUT_DB += opttVar
 REGRESSION_TESTS_WITHOUT_DB += userfunc
 
 REGRESSION_TESTS += $(REGRESSION_TESTS_WITHOUT_DB)
diff --git a/test/validate/sncDelay.st b/test/validate/delay.st
similarity index 97%
rename from test/validate/sncDelay.st
rename to test/validate/delay.st
index 7401e153cd39295180ba4a5d5537fa6d10494512..6e8b123eb08da8ff93db7a70d9557c4c033cce56 100644
--- a/test/validate/sncDelay.st
+++ b/test/validate/delay.st
@@ -1,4 +1,4 @@
-program sncDelayTest
+program delayTest
 /* snc test program to demonstrate delay and state transition without
    using external events.
 */
@@ -9,9 +9,6 @@ option +s;
 float v = 0;
 assign v;
 
-string msg;
-assign msg;
-
 ss test {
     float thr = 5.0;
     float hyst = 0.45;
diff --git a/test/validate/sncEntry.st b/test/validate/entry.st
similarity index 97%
rename from test/validate/sncEntry.st
rename to test/validate/entry.st
index be7120369c755a25d2104475653456100adcb206..4a638e29985639a3f039e56cdda4740d797d1172 100644
--- a/test/validate/sncEntry.st
+++ b/test/validate/entry.st
@@ -1,5 +1,5 @@
 /* snc test program to test entry and exit condition execution. */
-program sncEntryTest
+program entryTest
 
 option +s;
 
diff --git a/test/validate/sncEntryOpte.st b/test/validate/entryOpte.st
similarity index 98%
rename from test/validate/sncEntryOpte.st
rename to test/validate/entryOpte.st
index 07a0c8f83bba9ed69a27fd2623fb6330fec419af..b9c987f3abae4393cfd05ccc124813813ab288a2 100644
--- a/test/validate/sncEntryOpte.st
+++ b/test/validate/entryOpte.st
@@ -1,4 +1,4 @@
-program sncEntryOpteTest
+program entryOpteTest
 /* snc test program to test entry and exit condition execution, with -e
  * option. Test -e, that entry will be executed on each iteration.
  */
diff --git a/test/validate/sncEntryVar.st b/test/validate/entryVar.st
similarity index 99%
rename from test/validate/sncEntryVar.st
rename to test/validate/entryVar.st
index c39705b1a0adfcb6b5ed70271ec899fad421200d..4ef9fb69ba86355e1cd95f4692052aaa0f28d88b 100644
--- a/test/validate/sncEntryVar.st
+++ b/test/validate/entryVar.st
@@ -1,4 +1,4 @@
-program sncEntryVarTest
+program entryVarTest
 /* snc test program to test entry and exit condition execution, with CA
  * assignment and control of transition. 
  * In this case, CD01:FD:PERIOD has units "seconds", and lopr = 10, hopr = 360.
diff --git a/test/validate/sncExitOptx.st b/test/validate/exitOptx.st
similarity index 98%
rename from test/validate/sncExitOptx.st
rename to test/validate/exitOptx.st
index 9ec8c78dfe22915cd3ebd84e9e0c239452394535..997819ffca7b788a6b29db9ea2628d116b32ab69 100644
--- a/test/validate/sncExitOptx.st
+++ b/test/validate/exitOptx.st
@@ -1,4 +1,4 @@
-program sncExitOptxTest
+program exitOptxTest
 /* snc test program to test entry and exit condition execution, with -e
  * option. Test -e, that entry will be executed on each iteration.
  */
diff --git a/test/validate/sncOptt.st b/test/validate/optt.st
similarity index 98%
rename from test/validate/sncOptt.st
rename to test/validate/optt.st
index 4b2929bdbefcbf0d472ac76b068d5041b7e3e42d..245fee33a528a26f283e6f45874b1900882faf62 100644
--- a/test/validate/sncOptt.st
+++ b/test/validate/optt.st
@@ -1,4 +1,4 @@
-program sncOpttTest
+program opttTest
 /* snc test program to test state option -t, not to reset timers.
  */
 
diff --git a/test/validate/sncOpttVar.st b/test/validate/opttVar.st
similarity index 99%
rename from test/validate/sncOpttVar.st
rename to test/validate/opttVar.st
index c64b3dd5e863ba93cf8f6b6ba461f672e4be0f2f..a86da7603e87d7bb440d33fda57f8759a7851ebc 100644
--- a/test/validate/sncOpttVar.st
+++ b/test/validate/opttVar.st
@@ -1,4 +1,4 @@
-program sncOpttVarTest
+program opttVarTest
 
 %%#include "../testSupport.h"
 
diff --git a/test/validate/syncq.st b/test/validate/syncq.st
index 2e9578acc128a2008f11345b6987aa501299c349..2b751a2a839fc060e8c53d80069d4142182cf781 100644
--- a/test/validate/syncq.st
+++ b/test/validate/syncq.st
@@ -14,13 +14,6 @@ monitor s1;
 evflag ef_s1;
 syncq s1 to ef_s1 5;
 
-/* just to validate default queue size */
-string x;
-assign x to "syncq";
-monitor x;
-evflag ef_x;
-syncq x to ef_x;
-
 int n = 0;
 assign n;
 monitor n;