diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 7d1ea5f4a..744cff0c6 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -320,10 +320,10 @@ $(OBJLIB_MUNCHNAME): %.munch: %_ctdt$(OBJ) %$(OBJ)
 #---------------------------------------------------------------
 # Automated testing
 
-runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
+runtests: $(TESTSCRIPTS)
 	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 
-testspec: $(TESTSCRIPTS_$(BUILD_CLASS))
+testspec: $(TESTSCRIPTS)
 	@$(RM) $@
 	@echo OS-class: $(OS_CLASS) > $@
 	@echo Target-arch: $(T_A) >> $@
diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon
index 0989c1fa9..acc1a9660 100644
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -20,8 +20,8 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX_BASE = .so
-SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE).$(SHRLIB_VERSION)
-LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE).$(LOADABLE_SHRLIB_VERSION)
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------
diff --git a/configure/os/CONFIG.Common.linux-arm b/configure/os/CONFIG.Common.linux-arm
index 7ccb1bbad..15dad9e9e 100644
--- a/configure/os/CONFIG.Common.linux-arm
+++ b/configure/os/CONFIG.Common.linux-arm
@@ -17,7 +17,7 @@ ifeq ($(BUILD_CLASS),CROSS)
 
     # prefix of compiler tools
     CMPLR_SUFFIX =
-    CMPLR_PREFIX = $(GNU_TARGET)-
+    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
 
     # Provide a link-time path for shared libraries
     SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)