diff --git a/tests/CppUnit/TestRunner.cpp b/test/CppUnit/TestRunner.cpp
similarity index 100%
rename from tests/CppUnit/TestRunner.cpp
rename to test/CppUnit/TestRunner.cpp
diff --git a/tests/CppUnit/TestRunner.hpp b/test/CppUnit/TestRunner.hpp
similarity index 100%
rename from tests/CppUnit/TestRunner.hpp
rename to test/CppUnit/TestRunner.hpp
diff --git a/tests/CppUnit/framework/CppUnitException.h b/test/CppUnit/framework/CppUnitException.h
similarity index 100%
rename from tests/CppUnit/framework/CppUnitException.h
rename to test/CppUnit/framework/CppUnitException.h
diff --git a/tests/CppUnit/framework/Guards.h b/test/CppUnit/framework/Guards.h
similarity index 100%
rename from tests/CppUnit/framework/Guards.h
rename to test/CppUnit/framework/Guards.h
diff --git a/tests/CppUnit/framework/Test.h b/test/CppUnit/framework/Test.h
similarity index 100%
rename from tests/CppUnit/framework/Test.h
rename to test/CppUnit/framework/Test.h
diff --git a/tests/CppUnit/framework/TestCaller.h b/test/CppUnit/framework/TestCaller.h
similarity index 100%
rename from tests/CppUnit/framework/TestCaller.h
rename to test/CppUnit/framework/TestCaller.h
diff --git a/tests/CppUnit/framework/TestCase.cpp b/test/CppUnit/framework/TestCase.cpp
similarity index 100%
rename from tests/CppUnit/framework/TestCase.cpp
rename to test/CppUnit/framework/TestCase.cpp
diff --git a/tests/CppUnit/framework/TestCase.h b/test/CppUnit/framework/TestCase.h
similarity index 100%
rename from tests/CppUnit/framework/TestCase.h
rename to test/CppUnit/framework/TestCase.h
diff --git a/tests/CppUnit/framework/TestFailure.cpp b/test/CppUnit/framework/TestFailure.cpp
similarity index 100%
rename from tests/CppUnit/framework/TestFailure.cpp
rename to test/CppUnit/framework/TestFailure.cpp
diff --git a/tests/CppUnit/framework/TestFailure.h b/test/CppUnit/framework/TestFailure.h
similarity index 100%
rename from tests/CppUnit/framework/TestFailure.h
rename to test/CppUnit/framework/TestFailure.h
diff --git a/tests/CppUnit/framework/TestResult.cpp b/test/CppUnit/framework/TestResult.cpp
similarity index 100%
rename from tests/CppUnit/framework/TestResult.cpp
rename to test/CppUnit/framework/TestResult.cpp
diff --git a/tests/CppUnit/framework/TestResult.h b/test/CppUnit/framework/TestResult.h
similarity index 100%
rename from tests/CppUnit/framework/TestResult.h
rename to test/CppUnit/framework/TestResult.h
diff --git a/tests/CppUnit/framework/TestSuite.cpp b/test/CppUnit/framework/TestSuite.cpp
similarity index 100%
rename from tests/CppUnit/framework/TestSuite.cpp
rename to test/CppUnit/framework/TestSuite.cpp
diff --git a/tests/CppUnit/framework/TestSuite.h b/test/CppUnit/framework/TestSuite.h
similarity index 100%
rename from tests/CppUnit/framework/TestSuite.h
rename to test/CppUnit/framework/TestSuite.h
diff --git a/tests/CppUnit/framework/estring.h b/test/CppUnit/framework/estring.h
similarity index 100%
rename from tests/CppUnit/framework/estring.h
rename to test/CppUnit/framework/estring.h
diff --git a/tests/CppUnit/textui/TextTestResult.cpp b/test/CppUnit/textui/TextTestResult.cpp
similarity index 100%
rename from tests/CppUnit/textui/TextTestResult.cpp
rename to test/CppUnit/textui/TextTestResult.cpp
diff --git a/tests/CppUnit/textui/TextTestResult.h b/test/CppUnit/textui/TextTestResult.h
similarity index 100%
rename from tests/CppUnit/textui/TextTestResult.h
rename to test/CppUnit/textui/TextTestResult.h
diff --git a/tests/DOM/Makefile.am b/test/DOM/Makefile.am
similarity index 100%
rename from tests/DOM/Makefile.am
rename to test/DOM/Makefile.am
diff --git a/tests/DOM/dom_test_suite.hpp b/test/DOM/dom_test_suite.hpp
similarity index 100%
rename from tests/DOM/dom_test_suite.hpp
rename to test/DOM/dom_test_suite.hpp
diff --git a/tests/DOM/main.cpp b/test/DOM/main.cpp
similarity index 100%
rename from tests/DOM/main.cpp
rename to test/DOM/main.cpp
diff --git a/tests/DOM/main_silly.cpp b/test/DOM/main_silly.cpp
similarity index 100%
rename from tests/DOM/main_silly.cpp
rename to test/DOM/main_silly.cpp
diff --git a/tests/DOM/main_wide.cpp b/test/DOM/main_wide.cpp
similarity index 100%
rename from tests/DOM/main_wide.cpp
rename to test/DOM/main_wide.cpp
diff --git a/tests/DOM/test_Attribute.h b/test/DOM/test_Attribute.h
similarity index 100%
rename from tests/DOM/test_Attribute.h
rename to test/DOM/test_Attribute.h
diff --git a/tests/DOM/test_CDATA.hpp b/test/DOM/test_CDATA.hpp
similarity index 100%
rename from tests/DOM/test_CDATA.hpp
rename to test/DOM/test_CDATA.hpp
diff --git a/tests/DOM/test_CharacterData.hpp b/test/DOM/test_CharacterData.hpp
similarity index 100%
rename from tests/DOM/test_CharacterData.hpp
rename to test/DOM/test_CharacterData.hpp
diff --git a/tests/DOM/test_DOMImplementation.h b/test/DOM/test_DOMImplementation.h
similarity index 100%
rename from tests/DOM/test_DOMImplementation.h
rename to test/DOM/test_DOMImplementation.h
diff --git a/tests/DOM/test_Document.h b/test/DOM/test_Document.h
similarity index 100%
rename from tests/DOM/test_Document.h
rename to test/DOM/test_Document.h
diff --git a/tests/DOM/test_DocumentFragment.h b/test/DOM/test_DocumentFragment.h
similarity index 100%
rename from tests/DOM/test_DocumentFragment.h
rename to test/DOM/test_DocumentFragment.h
diff --git a/tests/DOM/test_DocumentType.h b/test/DOM/test_DocumentType.h
similarity index 100%
rename from tests/DOM/test_DocumentType.h
rename to test/DOM/test_DocumentType.h
diff --git a/tests/DOM/test_Element.h b/test/DOM/test_Element.h
similarity index 100%
rename from tests/DOM/test_Element.h
rename to test/DOM/test_Element.h
diff --git a/tests/DOM/test_ProcessingInstruction.h b/test/DOM/test_ProcessingInstruction.h
similarity index 100%
rename from tests/DOM/test_ProcessingInstruction.h
rename to test/DOM/test_ProcessingInstruction.h
diff --git a/tests/DOM/test_Siblings.h b/test/DOM/test_Siblings.h
similarity index 100%
rename from tests/DOM/test_Siblings.h
rename to test/DOM/test_Siblings.h
diff --git a/tests/DOM/test_Text.hpp b/test/DOM/test_Text.hpp
similarity index 100%
rename from tests/DOM/test_Text.hpp
rename to test/DOM/test_Text.hpp
diff --git a/tests/Makefile.am b/test/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to test/Makefile.am
diff --git a/tests/SAX/FilterTest.cpp b/test/SAX/FilterTest.cpp
similarity index 100%
rename from tests/SAX/FilterTest.cpp
rename to test/SAX/FilterTest.cpp
diff --git a/tests/SAX2DOM/Makefile.am b/test/SAX2DOM/Makefile.am
similarity index 100%
rename from tests/SAX2DOM/Makefile.am
rename to test/SAX2DOM/Makefile.am
diff --git a/tests/SAX2DOM/SAX2DOM_test.dsp b/test/SAX2DOM/SAX2DOM_test.dsp
similarity index 100%
rename from tests/SAX2DOM/SAX2DOM_test.dsp
rename to test/SAX2DOM/SAX2DOM_test.dsp
diff --git a/tests/SAX2DOM/main.cpp b/test/SAX2DOM/main.cpp
similarity index 100%
rename from tests/SAX2DOM/main.cpp
rename to test/SAX2DOM/main.cpp
diff --git a/tests/SAX2DOM/test_SAX.h b/test/SAX2DOM/test_SAX.h
similarity index 100%
rename from tests/SAX2DOM/test_SAX.h
rename to test/SAX2DOM/test_SAX.h
diff --git a/tests/SAX2DOM/test_TreeWalker.hpp b/test/SAX2DOM/test_TreeWalker.hpp
similarity index 100%
rename from tests/SAX2DOM/test_TreeWalker.hpp
rename to test/SAX2DOM/test_TreeWalker.hpp
diff --git a/tests/XPath/Makefile.am b/test/XPath/Makefile.am
similarity index 100%
rename from tests/XPath/Makefile.am
rename to test/XPath/Makefile.am
diff --git a/tests/XPath/arithmetic_test.hpp b/test/XPath/arithmetic_test.hpp
similarity index 100%
rename from tests/XPath/arithmetic_test.hpp
rename to test/XPath/arithmetic_test.hpp
diff --git a/tests/XPath/attr_value_test.hpp b/test/XPath/attr_value_test.hpp
similarity index 100%
rename from tests/XPath/attr_value_test.hpp
rename to test/XPath/attr_value_test.hpp
diff --git a/tests/XPath/axis_enumerator_test.hpp b/test/XPath/axis_enumerator_test.hpp
similarity index 100%
rename from tests/XPath/axis_enumerator_test.hpp
rename to test/XPath/axis_enumerator_test.hpp
diff --git a/tests/XPath/execute_test.hpp b/test/XPath/execute_test.hpp
similarity index 100%
rename from tests/XPath/execute_test.hpp
rename to test/XPath/execute_test.hpp
diff --git a/tests/XPath/expression_test.hpp b/test/XPath/expression_test.hpp
similarity index 100%
rename from tests/XPath/expression_test.hpp
rename to test/XPath/expression_test.hpp
diff --git a/tests/XPath/logical_test.hpp b/test/XPath/logical_test.hpp
similarity index 100%
rename from tests/XPath/logical_test.hpp
rename to test/XPath/logical_test.hpp
diff --git a/tests/XPath/main.cpp b/test/XPath/main.cpp
similarity index 100%
rename from tests/XPath/main.cpp
rename to test/XPath/main.cpp
diff --git a/tests/XPath/main_silly.cpp b/test/XPath/main_silly.cpp
similarity index 100%
rename from tests/XPath/main_silly.cpp
rename to test/XPath/main_silly.cpp
diff --git a/tests/XPath/main_wide.cpp b/test/XPath/main_wide.cpp
similarity index 100%
rename from tests/XPath/main_wide.cpp
rename to test/XPath/main_wide.cpp
diff --git a/tests/XPath/match_test.hpp b/test/XPath/match_test.hpp
similarity index 100%
rename from tests/XPath/match_test.hpp
rename to test/XPath/match_test.hpp
diff --git a/tests/XPath/node_test_test.hpp b/test/XPath/node_test_test.hpp
similarity index 100%
rename from tests/XPath/node_test_test.hpp
rename to test/XPath/node_test_test.hpp
diff --git a/tests/XPath/parse_test.hpp b/test/XPath/parse_test.hpp
similarity index 100%
rename from tests/XPath/parse_test.hpp
rename to test/XPath/parse_test.hpp
diff --git a/tests/XPath/relational_test.hpp b/test/XPath/relational_test.hpp
similarity index 100%
rename from tests/XPath/relational_test.hpp
rename to test/XPath/relational_test.hpp
diff --git a/tests/XPath/step_test.hpp b/test/XPath/step_test.hpp
similarity index 100%
rename from tests/XPath/step_test.hpp
rename to test/XPath/step_test.hpp
diff --git a/tests/XPath/value_test.hpp b/test/XPath/value_test.hpp
similarity index 100%
rename from tests/XPath/value_test.hpp
rename to test/XPath/value_test.hpp
diff --git a/tests/XPath/xpath_test_suite.hpp b/test/XPath/xpath_test_suite.hpp
similarity index 100%
rename from tests/XPath/xpath_test_suite.hpp
rename to test/XPath/xpath_test_suite.hpp
diff --git a/tests/silly_string/silly_string.cpp b/test/silly_string/silly_string.cpp
similarity index 100%
rename from tests/silly_string/silly_string.cpp
rename to test/silly_string/silly_string.cpp
diff --git a/tests/silly_string/silly_string.hpp b/test/silly_string/silly_string.hpp
similarity index 100%
rename from tests/silly_string/silly_string.hpp
rename to test/silly_string/silly_string.hpp