diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.dsc b/src/test/tpkg/100-compile.tpkg/100-compile.dsc
index e39ac6a7..8f73a87f 100644
--- a/src/test/tpkg/100-compile.tpkg/100-compile.dsc
+++ b/src/test/tpkg/100-compile.tpkg/100-compile.dsc
@@ -9,7 +9,7 @@ CmdDepends:
 Depends: 
 Help:
 Pre: 100-compile.pre
-Post:
+Post: 100-compile.post
 Test: 100-compile.test
 AuxFiles: 
 Passed:
diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.post b/src/test/tpkg/100-compile.tpkg/100-compile.post
new file mode 100644
index 00000000..7744f6e7
--- /dev/null
+++ b/src/test/tpkg/100-compile.tpkg/100-compile.post
@@ -0,0 +1,20 @@
+# #-- 100-compile.post --#
+# source the master var file when it's there
+if [ -f ../.tpkg.var.master ]
+then
+	source ../.tpkg.var.master
+else
+	(
+		cd ..
+		[ -f  "${TPKG_SRCDIR}/setup-env.sh" ] \
+		    && sh "${TPKG_SRCDIR}/setup-env.sh"
+	) && source ../.tpkg.var.master
+fi
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+for f in `cat restore-srcdir-configure-settings`
+do
+	mv "${SRCROOT}/${f}.build" "${SRCROOT}/${f}"
+done
+
diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.pre b/src/test/tpkg/100-compile.tpkg/100-compile.pre
index a0272ed3..95fbced2 100644
--- a/src/test/tpkg/100-compile.tpkg/100-compile.pre
+++ b/src/test/tpkg/100-compile.tpkg/100-compile.pre
@@ -13,6 +13,15 @@ fi
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+echo "" > restore-srcdir-configure-settings
+for f in `grep 'CONFIG_[FH][IE][LA][ED][SE]' "${SRCROOT}/configure.ac" | sed -e 's/^.*(\[//g' -e 's/\])//g'`
+do
+	if [ -f "${SRCROOT}/$f" ]
+	then
+		mv "${SRCROOT}/${f}" "${SRCROOT}/${f}.build" && \
+			echo "$f" >> restore-srcdir-configure-settings
+	fi
+done
 rm -fr "${BUILDDIR}/build"
 mkdir  "${BUILDDIR}/build"
 cd "${BUILDDIR}/build"
diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc
index 3cf0cd88..4faf21b2 100644
--- a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc
+++ b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc
@@ -9,7 +9,7 @@ CmdDepends:
 Depends: 
 Help:
 Pre: 200-stub-only-compile.pre
-Post:
+Post: 200-stub-only-compile.post
 Test: 200-stub-only-compile.test
 AuxFiles: 
 Passed:
diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.post b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.post
new file mode 100644
index 00000000..0a681250
--- /dev/null
+++ b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.post
@@ -0,0 +1,20 @@
+# #-- 200-stub-only-compile.post --#
+# source the master var file when it's there
+if [ -f ../.tpkg.var.master ]
+then
+	source ../.tpkg.var.master
+else
+	(
+		cd ..
+		[ -f  "${TPKG_SRCDIR}/setup-env.sh" ] \
+		    && sh "${TPKG_SRCDIR}/setup-env.sh"
+	) && source ../.tpkg.var.master
+fi
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+for f in `cat restore-srcdir-configure-settings`
+do
+	mv "${SRCROOT}/${f}.build-stub-only" "${SRCROOT}/${f}"
+done
+
diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre
index e95a7446..0b41e374 100644
--- a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre
+++ b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre
@@ -13,6 +13,15 @@ fi
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+echo "" > restore-srcdir-configure-settings
+for f in `grep 'CONFIG_[FH][IE][LA][ED][SE]' "${SRCROOT}/configure.ac" | sed -e 's/^.*(\[//g' -e 's/\])//g'`
+do
+	if [ -f "${SRCROOT}/$f" ]
+	then
+		mv "${SRCROOT}/${f}" "${SRCROOT}/${f}.build-stub-only" && \
+			echo "$f" >> restore-srcdir-configure-settings
+	fi
+done
 rm -fr "${BUILDDIR}/build-stub-only"
 mkdir  "${BUILDDIR}/build-stub-only"
 cd "${BUILDDIR}/build-stub-only"
diff --git a/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.dsc b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.dsc
index 96d36c48..61defe2c 100644
--- a/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.dsc
+++ b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.dsc
@@ -8,8 +8,8 @@ Component:
 CmdDepends: 
 Depends: 300-event-loops-configure.tpkg
 Help:
-Pre:
-Post:
+Pre: 320-event-loops-compile.pre
+Post: 320-event-loops-compile.post
 Test: 320-event-loops-compile.test
 AuxFiles: 
 Passed:
diff --git a/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.post b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.post
new file mode 100644
index 00000000..a3e29076
--- /dev/null
+++ b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.post
@@ -0,0 +1,20 @@
+# #-- 320-event-loops-compile.post --#
+# source the master var file when it's there
+if [ -f ../.tpkg.var.master ]
+then
+	source ../.tpkg.var.master
+else
+	(
+		cd ..
+		[ -f  "${TPKG_SRCDIR}/setup-env.sh" ] \
+		    && sh "${TPKG_SRCDIR}/setup-env.sh"
+	) && source ../.tpkg.var.master
+fi
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+for f in `cat restore-srcdir-configure-settings`
+do
+	mv "${SRCROOT}/${f}.build-event-loops" "${SRCROOT}/${f}"
+done
+
diff --git a/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.pre b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.pre
new file mode 100644
index 00000000..a48754d4
--- /dev/null
+++ b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.pre
@@ -0,0 +1,24 @@
+# #-- 320-event-loops-compile.pre--#
+# source the master var file when it's there
+if [ -f ../.tpkg.var.master ]
+then
+	source ../.tpkg.var.master
+else
+	(
+		cd ..
+		[ -f  "${TPKG_SRCDIR}/setup-env.sh" ] \
+		    && sh "${TPKG_SRCDIR}/setup-env.sh" 
+	) && source ../.tpkg.var.master
+fi
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+echo "" > restore-srcdir-configure-settings
+for f in `grep 'CONFIG_[FH][IE][LA][ED][SE]' "${SRCROOT}/configure.ac" | sed -e 's/^.*(\[//g' -e 's/\])//g'`
+do
+	if [ -f "${SRCROOT}/$f" ]
+	then
+		mv "${SRCROOT}/${f}" "${SRCROOT}/${f}.build-event-loops" && \
+			echo "$f" >> restore-srcdir-configure-settings
+	fi
+done