diff --git a/ChangeLog b/ChangeLog
index 24360d42..84ed3912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-05-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (check-local): Move `$(TESTS_ENVIRONMENT)' and
+	`$(BUILDCHECK_ENVIRONMENT)' to be arguments of `testsuite', so
+	that reruns will remember it; set enviroment variable
+	`CONFIG_SHELL' so the suite will know which shell it was started
+	with.
+	(installcheck-local): Likewise, for `$(TESTS_ENVIRONMENT)' and
+	`$(INSTALLCHECK_ENVIRONMENT)'.
+	* tests/testsuite.at (LT_AT_TAG): Do not set the compiler
+	variable here.
+
 2006-05-14  Albert Chin-A-Young  <china@thewrittenword.com>
 
 	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)
diff --git a/Makefile.am b/Makefile.am
index 20a5a9ce..a13dbc4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -453,12 +453,15 @@ CD_TESTDIR	= abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests
 # Hook the test suite into the check rule
 check-local: tests/atconfig $(srcdir)/$(TESTSUITE)
 	$(CD_TESTDIR); \
-	$(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS)
+	CONFIG_SHELL="$(SHELL)" $(SHELL) $$abs_srcdir/$(TESTSUITE) \
+	  $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(TESTSUITE_FLAGS)
 
 # Run the test suite on the *installed* tree.
 installcheck-local:
 	$(CD_TESTDIR); \
-	$(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
+	CONFIG_SHELL="$(SHELL)" $(SHELL) $$abs_srcdir/$(TESTSUITE) \
+	  $(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(TESTSUITE_FLAGS) \
+	  AUTOTEST_PATH="$(exec_prefix)/bin"
 
 # We need to remove any file droppings left behind by testsuite
 clean-local: clean-local-legacy
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 1967a7aa..6d449c70 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -153,11 +153,6 @@ m4_define([LT_AT_EXEC_CHECK],
 # --------------
 m4_define([LT_AT_TAG],
 [AT_KEYWORDS([$1])
-eval `$LIBTOOL --tag=$1 --config | sed -n '
-    /^CC=/{
-	s/CC/$1/
-	p
-    }'`
 AT_CHECK([test -n "[$]$1" || (exit 77)])
 ])