diff --git a/configure/RULES_ARCHS b/configure/RULES_ARCHS
index 193efb8d4..2e567df5a 100644
--- a/configure/RULES_ARCHS
+++ b/configure/RULES_ARCHS
@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
 # $Id$
@@ -20,8 +19,9 @@ rebuild: clean install
 ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
-ACTIONS += buildInstall 
-ACTIONS += browse 
+ACTIONS += buildInstall
+ACTIONS += browse
+ACTIONS += runtests
 
 actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
@@ -41,7 +41,7 @@ $(BUILD_ARCHS) : % : O.% O.Common
 
 $(ACTIONS):%: $(foreach arch, $(BUILD_ARCHS), %$(DIVIDER)$(arch))
 
-$(buildDirs): 
+$(buildDirs):
 	$(PERL) $(TOOLS)/makeMakefile.pl $@ $(TOP)/..
 
 O.Common:
@@ -79,16 +79,11 @@ archclean ::
 $(cleanArchTargets) ::
 	$(RMDIR) O.$(archPart)
 
-realclean :: 
+realclean ::
 	$(RMDIR) O.*
 
-runtests: $(addprefix  O.$(EPICS_HOST_ARCH)/,$(TESTSCRIPTS_HOST)) 
-	$(PERL) -e 'use Test::Harness; runtests @ARGV;'  $^
-
 .PHONY : $(actionArchTargets)
 .PHONY : $(cleanArchTargets)
 .PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean archclean all
 .PHONY : checkRelease $(checkReleaseTargets)
-.PHONY : runtests
-
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index e851ed756..4225c5f80 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 # $Id$
 #
@@ -317,7 +316,7 @@ $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	$(MUNCH_CMD)
 
 runtests: $(TESTSCRIPTS_HOST)
-	$(PERL) -e 'use Test::Harness; runtests @ARGV;' $(TESTSCRIPTS_HOST)
+	$(PERL) -e 'use Test::Harness; runtests @ARGV if @ARGV;' $^
 
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS
index 888102812..f597a5c83 100644
--- a/configure/RULES_DIRS
+++ b/configure/RULES_DIRS
@@ -1,24 +1,23 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
 #  $Id$
 #
- 
+
 
 ARCHS += $(BUILD_ARCHS)
-ACTIONS += inc build install buildInstall clean realclean archclean
- 
+ACTIONS += inc build install buildInstall clean realclean archclean runtests
+
 dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
 actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$@)), \
- $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@))))
- 
+    $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@))))
+
 dirActionArchTargets = $(foreach dir, $(DIRS), \
                        $(foreach action, $(ACTIONS),\
                        $(foreach arch, $(ARCHS), \