diff --git a/ChangeLog b/ChangeLog
index 7f7ea728..6bc9e0ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 13 14:58:33 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
+
+	* xstc/Makefile.am: Some more adjustments.
+
 Mon Jun 13 14:35:59 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
 
 	* xstc/Makefile.am: Changed test extraction process, since some
diff --git a/xstc/Makefile.am b/xstc/Makefile.am
index 7fda77d0..6ba9e489 100644
--- a/xstc/Makefile.am
+++ b/xstc/Makefile.am
@@ -28,7 +28,7 @@ all:
 #
 # Rule to load the test description and extract the informations
 #
-$(TESTDIRS) Tests/$(NISTTESTDEF_2) Tests/$(MSTTESTDEF) Tests/$(SUNTESTDEF):
+$(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/Metadata/$(SUNTESTDEF):
 	-@(if [ ! -d Tests ] ; then \
 	   mkdir Tests ; \
 	   fi)
@@ -50,6 +50,8 @@ $(TESTDIRS) Tests/$(NISTTESTDEF_2) Tests/$(MSTTESTDEF) Tests/$(SUNTESTDEF):
 	-@(if [ -f $(TARBALL) ] ; then \
 	   echo -n "extracting test data (Sun, Microsoft)..." ; \
 	   $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
+	   if [ -d Tests/suntest ] ; then rm -r Tests/suntest ; fi ; \
+	   if [ -d Tests/msxsdtest ] ; then rm -r Tests/msxsdtest ; fi ; \
 	   mv Tests/xmlschema2002-01-16/* Tests ; \
 	   mv Tests/*.testSet Tests/Metadata ; \
 	   rm -r Tests/xmlschema2002-01-16 ; \
@@ -59,7 +61,7 @@ $(TESTDIRS) Tests/$(NISTTESTDEF_2) Tests/$(MSTTESTDEF) Tests/$(SUNTESTDEF):
 #
 # The python tests are generated via XSLT
 #
-nist-test.py: Tests/$(NISTTESTDEF_2) xstc-to-python.xsl
+nist-test.py: Tests/Metadata/$(NISTTESTDEF_2) xstc-to-python.xsl
 	-@(if [ -x $(XSLTPROC) ] ; then \
 	  echo "Rebuilding script (NIST)" $@ ; \
 	  $(XSLTPROC) --nonet --stringparam vendor NIST-2 \
@@ -67,7 +69,7 @@ nist-test.py: Tests/$(NISTTESTDEF_2) xstc-to-python.xsl
 	                     $(srcdir)/Tests/Metadata/$(NISTTESTDEF_2) > $@ ; \
 	  chmod +x $@ ; fi )
 
-ms-test.py: Tests/$(MSTTESTDEF) xstc-to-python.xsl
+ms-test.py: Tests/Metadata/$(MSTTESTDEF) xstc-to-python.xsl
 	-@(if [ -x $(XSLTPROC) ] ; then \
 	  echo "Rebuilding script (Microsoft)" $@ ; \
 	  $(XSLTPROC) --nonet --stringparam vendor MS \
@@ -75,7 +77,7 @@ ms-test.py: Tests/$(MSTTESTDEF) xstc-to-python.xsl
 	                     $(srcdir)/Tests/Metadata/$(MSTESTDEF) > $@ ; \
 	  chmod +x $@ ; fi )
 
-sun-test.py: Tests/$(SUNTESTDEF) xstc-to-python.xsl
+sun-test.py: Tests/Metadata/$(SUNTESTDEF) xstc-to-python.xsl
 	-@(if [ -x $(XSLTPROC) ] ; then \
 	  echo "Rebuilding script (Sun)" $@ ; \
 	  $(XSLTPROC) --nonet --stringparam vendor SUN \