diff --git a/configure/os/CONFIG.Linux.win32-x86 b/configure/os/CONFIG.Linux.win32-x86
new file mode 100644
index 000000000..a9a04c3a8
--- /dev/null
+++ b/configure/os/CONFIG.Linux.win32-x86
@@ -0,0 +1,4 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+export WINEPREFIX = $(HOME)/.wine32-$(EPICS_HOST_ARCH)
diff --git a/configure/os/CONFIG.Linux.windows-x64 b/configure/os/CONFIG.Linux.windows-x64
index b79cd9c9f..edbbf8758 100644
--- a/configure/os/CONFIG.Linux.windows-x64
+++ b/configure/os/CONFIG.Linux.windows-x64
@@ -4,8 +4,8 @@ VALID_BUILDS = Ioc Command
 
 MSVC_VERSION ?= 2019
 PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
+export WINE ?= wine64
 export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
-export WINEDEBUG=fixme-all
-export WINEDLLOVERRIDES="mscoree,mshtml="
-export WINE = wine64
-export WINEPATH = $(realpath $(INSTALL_BIN))
+export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
+export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
+export WINEPATH := $(WINEPATH:%=%;)$(abspath $(INSTALL_BIN))
diff --git a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common
index 5fd9ce935..6f6ea176f 100644
--- a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common
+++ b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common
@@ -2,9 +2,12 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
 
 # Improved error checking with clang
 CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL9-x86_64-clang
 
 # Build for old RHEL8 64 bit
 CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL8-x86_64
 
 # Build for old RHEL7 64 bit
 #CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+#CROSS_COMPILER_RUNTEST_TARGET_ARCHS += RHEL7-x86_64
diff --git a/configure/os/CONFIG_SITE.linux-x86_64.win32-x86-mingw b/configure/os/CONFIG_SITE.linux-x86_64.win32-x86-mingw
index 99836730a..671cdfb96 100644
--- a/configure/os/CONFIG_SITE.linux-x86_64.win32-x86-mingw
+++ b/configure/os/CONFIG_SITE.linux-x86_64.win32-x86-mingw
@@ -6,3 +6,9 @@
 # Inherit from the linux-x86 host architecture
 include $(CONFIG)/os/CONFIG_SITE.linux-x86.win32-x86-mingw
 
+MINGWLIBS ?= /usr/i686-w64-mingw32/sys-root/mingw/bin
+export WINE ?= wine
+export WINEPREFIX = $(HOME)/.wine32-$(EPICS_HOST_ARCH)
+export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
+export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
+export WINEPATH := $(WINEPATH:%=%;)$(MINGWLIBS);$(abspath $(INSTALL_BIN))
diff --git a/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw b/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw
index e98ac7a02..169e0f57c 100644
--- a/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw
+++ b/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw
@@ -6,3 +6,9 @@
 # Inherit from the linux-x86 host architecture
 include $(CONFIG)/os/CONFIG_SITE.linux-x86.windows-x64-mingw
 
+MINGWLIBS ?= /usr/x86_64-w64-mingw32/sys-root/mingw/bin
+export WINE ?= wine64
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
+export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
+export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
+export WINEPATH := $(WINEPATH:%=%;)$(MINGWLIBS);$(abspath $(INSTALL_BIN))